aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2017-12-12 11:33:58 +0100
committerThomas White <taw@physics.org>2017-12-12 11:35:11 +0100
commitab5ab8f95fe7bbe12eda623ea4950872537c4f4c (patch)
tree87fc25512737a32a1251bc6e405a3a989e75a802
parentdec80f78c8719c6c7ec20076343aa2be4ce9ba84 (diff)
indexamajig: Rename --serial-offset to --serial-start
Because "offset" sounds like it will add the argument to the serial numbers, i.e. --serial-offset=500 would start at 501. Actually, you just give the first serial number you'd like.
-rw-r--r--src/im-sandbox.c4
-rw-r--r--src/im-sandbox.h2
-rw-r--r--src/indexamajig.c10
3 files changed, 8 insertions, 8 deletions
diff --git a/src/im-sandbox.c b/src/im-sandbox.c
index 83927f94..e01fcb74 100644
--- a/src/im-sandbox.c
+++ b/src/im-sandbox.c
@@ -831,7 +831,7 @@ static void try_status(struct sandbox *sb, time_t tNow)
void create_sandbox(struct index_args *iargs, int n_proc, char *prefix,
int config_basename, FILE *fh,
- Stream *stream, const char *tempdir, int serial_offset)
+ Stream *stream, const char *tempdir, int serial_start)
{
int i;
struct sandbox *sb;
@@ -860,7 +860,7 @@ void create_sandbox(struct index_args *iargs, int n_proc, char *prefix,
sb->t_last_stats = get_monotonic_seconds();
sb->n_proc = n_proc;
sb->iargs = iargs;
- sb->serial = serial_offset;
+ sb->serial = serial_start;
sb->fds = NULL;
sb->fhs = NULL;
diff --git a/src/im-sandbox.h b/src/im-sandbox.h
index f2ca0ce4..e937875f 100644
--- a/src/im-sandbox.h
+++ b/src/im-sandbox.h
@@ -71,6 +71,6 @@ struct sb_shm
extern void create_sandbox(struct index_args *iargs, int n_proc, char *prefix,
int config_basename, FILE *fh, Stream *stream,
- const char *tempdir, int serial_offset);
+ const char *tempdir, int serial_start);
#endif /* IM_SANDBOX_H */
diff --git a/src/indexamajig.c b/src/indexamajig.c
index 3def4efa..201ed960 100644
--- a/src/indexamajig.c
+++ b/src/indexamajig.c
@@ -174,7 +174,7 @@ static void show_help(const char *s)
" --copy-hdf5-field=<f> Copy the value of HDF5 field <f> into the stream\n"
" --no-peaks-in-stream Do not record peak search results in the stream\n"
" --no-refls-in-stream Do not record integrated reflections in the stream\n"
-" --serial-offset Start the serial numbers in the stream here\n"
+" --serial-start Start the serial numbers in the stream here\n"
"\nHistorical options:\n\n"
" --no-sat-corr Don't correct values of saturated peaks\n"
);
@@ -234,7 +234,7 @@ int main(int argc, char *argv[])
int if_peaks = 0;
int if_multi = 1;
int if_retry = 1;
- int serial_offset = 1;
+ int serial_start = 1;
/* Defaults */
iargs.cell = NULL;
@@ -692,9 +692,9 @@ int main(int argc, char *argv[])
break;
case 44:
- if ( sscanf(optarg, "%i", &serial_offset) != 1 )
+ if ( sscanf(optarg, "%i", &serial_start) != 1 )
{
- ERROR("Invalid value for --serial-offset\n");
+ ERROR("Invalid value for --serial-start\n");
return 1;
}
break;
@@ -1013,7 +1013,7 @@ int main(int argc, char *argv[])
gsl_set_error_handler_off();
create_sandbox(&iargs, n_proc, prefix, config_basename, fh,
- st, tempdir, serial_offset);
+ st, tempdir, serial_start);
free_imagefile_field_list(iargs.copyme);
cell_free(iargs.cell);