diff options
author | Thomas White <taw@physics.org> | 2020-07-30 10:16:37 +0200 |
---|---|---|
committer | Thomas White <taw@physics.org> | 2020-07-30 10:17:12 +0200 |
commit | e14e413957b0c1e357167f43f129a6ef39ef5051 (patch) | |
tree | c26d0a6235091010138a9313bf2cfb8924903610 /libcrystfel/src/felix.c | |
parent | f9a6d5ea442e074d1e61585b572837f80e2ddac9 (diff) |
Eliminate duplicate symbols
This makes searching easier, and also permits Meson's unity build mode.
Diffstat (limited to 'libcrystfel/src/felix.c')
-rw-r--r-- | libcrystfel/src/felix.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libcrystfel/src/felix.c b/libcrystfel/src/felix.c index 4f6372f4..524e68a7 100644 --- a/libcrystfel/src/felix.c +++ b/libcrystfel/src/felix.c @@ -800,7 +800,7 @@ const char *felix_probe(UnitCell *cell) } -static void show_help() +static void felix_show_help() { printf("Parameters for the Felix indexing algorithm:\n" " --felix-domega Degree range of omega (moscaicity) to consider.\n" @@ -832,7 +832,8 @@ static void show_help() } -static error_t parse_arg(int key, char *arg, struct argp_state *state) +static error_t felix_parse_arg(int key, char *arg, + struct argp_state *state) { struct felix_options **opts_ptr = state->input; float tmp; @@ -855,7 +856,7 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state) break; case 1 : - show_help(); + felix_show_help(); return EINVAL; case 2 : @@ -939,7 +940,7 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state) } -static struct argp_option options[] = { +static struct argp_option felix_options[] = { {"help-felix", 1, NULL, OPTION_NO_USAGE, "Show options for Felix indexing algorithm", 99}, @@ -958,4 +959,5 @@ static struct argp_option options[] = { }; -struct argp felix_argp = { options, parse_arg, NULL, NULL, NULL, NULL, NULL }; +struct argp felix_argp = { felix_options, felix_parse_arg, + NULL, NULL, NULL, NULL, NULL }; |