From be3595c63e5d310624f03be05cb2d2006c4963d2 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Mon, 10 Jan 2022 12:24:53 +0100 Subject: Generate placeholder filename/event earlier Previously, a placeholder was put in the queue ("ZMQdata //" or "ASAPOdata //"), and replaced by image_read_data_block. Instead, the "final" placeholder can be put in the queue already. Note that ASAP::O, at least, will replace this placeholder with a filename delivered by the data transport. --- libcrystfel/src/image.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'libcrystfel/src/image.c') diff --git a/libcrystfel/src/image.c b/libcrystfel/src/image.c index 2209ffee..1bad7d00 100644 --- a/libcrystfel/src/image.c +++ b/libcrystfel/src/image.c @@ -1391,7 +1391,6 @@ struct image *image_read_data_block(const DataTemplate *dtempl, int no_mask_data) { struct image *image; - char tmp[64]; if ( dtempl == NULL ) { ERROR("NULL data template!\n"); @@ -1404,9 +1403,8 @@ struct image *image_read_data_block(const DataTemplate *dtempl, return NULL; } - snprintf(tmp, 63, "datablock-%i", serial); - image->filename = strdup(tmp); - image->ev = strdup("//"); + image->filename = NULL; + image->ev = NULL; image->data_block = data_block; image->data_block_size = data_block_size; -- cgit v1.2.3