*
* uuidd --debug --no-fork --no-pid --socket /run/uuidd/request
*
- * if the $localstatedir (as defined by build-system) is /run. If you want
+ * if the $runstatedir (as defined by build-system) is /run. If you want
* to overwrite the built-in default then use:
*
- * make uuidd uuidgen localstatedir=/var
+ * make uuidd uuidgen runstatedir=/var/run
*/
#include <pthread.h>
#include <stdio.h>
static object_t *objects;
-static void __attribute__((__noreturn__)) usage(FILE *out)
+static void __attribute__((__noreturn__)) usage(void)
{
- fprintf(out, "\n %s [options]\n", program_invocation_short_name);
+ printf("\n %s [options]\n", program_invocation_short_name);
- fprintf(out, " -p <num> number of nprocesses (default:%zu)\n", nprocesses);
- fprintf(out, " -t <num> number of nthreads (default:%zu)\n", nthreads);
- fprintf(out, " -o <num> number of nobjects (default:%zu)\n", nobjects);
- fprintf(out, " -l <level> log level (default:%zu)\n", loglev);
- fprintf(out, " -h display help\n");
+ printf(" -p <num> number of nprocesses (default:%zu)\n", nprocesses);
+ printf(" -t <num> number of nthreads (default:%zu)\n", nthreads);
+ printf(" -o <num> number of nobjects (default:%zu)\n", nobjects);
+ printf(" -l <level> log level (default:%zu)\n", loglev);
+ printf(" -h display help\n");
- exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
+ exit(EXIT_SUCCESS);
}
static void allocate_segment(int *id, void **address, size_t number, size_t size)
object_uuid_create(obj);
obj->tid = th->tid;
obj->pid = th->proc->pid;
- obj->idx = th->index + i;;
+ obj->idx = th->index + i;
}
return NULL;
}
static void object_dump(size_t idx, object_t *obj)
{
- char uuid_string[37], *p;
+ char uuid_string[UUID_STR_LEN], *p;
p = uuid_string;
object_uuid_to_string(obj, &p);
fprintf(stderr, "}\n");
}
+#define MSG_TRY_HELP "Try '-h' for help."
+
int main(int argc, char *argv[])
{
size_t i, nfailed = 0, nignored = 0;
loglev = strtou32_or_err(optarg, "invalid log level argument");
break;
case 'h':
- usage(stdout);
+ usage();
break;
default:
- errtryh(EXIT_FAILURE);
+ fprintf(stderr, MSG_TRY_HELP);
+ exit(EXIT_FAILURE);
}
}
if (optind != argc)
- usage(stderr);
+ errx(EXIT_FAILURE, "bad usage\n" MSG_TRY_HELP);
if (loglev == 1)
fprintf(stderr, "requested: %zu processes, %zu threads, %zu objects per thread (%zu objects = %zu bytes)\n",