diff options
| author | Rob Austein <sra@hactrn.net> | 2014-04-26 02:30:47 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2014-04-26 02:30:47 +0000 |
| commit | 9319a6d6a9a54d516075f57cf09962f469a91b34 (patch) | |
| tree | b63a17372c0888d14ce8fe80d63a10230596042f | |
| parent | 59da7cc289eb19812f8db487919c7c72d4fe0c9c (diff) | |
Cleanup.
svn path=/trunk/; revision=5816
| -rw-r--r-- | rp/rcynic/defstack.h | 2 | ||||
| -rw-r--r-- | rp/rcynic/rcynic.c | 25 |
2 files changed, 2 insertions, 25 deletions
diff --git a/rp/rcynic/defstack.h b/rp/rcynic/defstack.h index 370c8129..c918dafb 100644 --- a/rp/rcynic/defstack.h +++ b/rp/rcynic/defstack.h @@ -1,6 +1,6 @@ /* * Automatically generated, do not edit. - * Generator $Id: defstack.py 4878 2012-11-15 22:13:53Z sra $ + * Generator $Id: defstack.py 5784 2014-04-10 22:56:47Z sra $ */ #ifndef __RCYNIC_C__DEFSTACK_H__ diff --git a/rp/rcynic/rcynic.c b/rp/rcynic/rcynic.c index dea9c48f..590f3b3f 100644 --- a/rp/rcynic/rcynic.c +++ b/rp/rcynic/rcynic.c @@ -476,10 +476,6 @@ typedef enum { typedef enum { RSYNC_STATES RSYNC_STATE_T_MAX } rsync_state_t; #undef QQ -#define QQ(x) #x , -static const char * const rsync_state_label[] = { RSYNC_STATES NULL }; -#undef QQ - /** * Context for asyncronous rsync. */ @@ -2607,12 +2603,6 @@ static int rsync_construct_select(const rcynic_ctx_t *rc, for (i = 0; (ctx = sk_rsync_ctx_t_value(rc->rsync_queue, i)) != NULL; ++i) { -#if 0 - logmsg(rc, log_debug, "+++ ctx[%d] pid %d fd %d state %s started %lu deadline %lu", - i, ctx->pid, ctx->fd, rsync_state_label[ctx->state], - (unsigned long) ctx->started, (unsigned long) ctx->deadline); -#endif - switch (ctx->state) { case rsync_state_running: @@ -5538,7 +5528,7 @@ static int write_xml_file(const rcynic_ctx_t *rc, /** - * Long options. + * Long options, with help. */ #define OPTIONS \ QA('a', "authenticated", "root of authenticated data tree") \ @@ -5552,19 +5542,6 @@ static int write_xml_file(const rcynic_ctx_t *rc, QF('V', "version", "print program version") \ QA('x', "xml-file", "set XML output file location") -const static struct option longopts[] = { - { "authenticated", required_argument, NULL, 'a' }, - { "config", required_argument, NULL, 'c' }, - { "help", no_argument, NULL, 'h' }, - { "jitter", required_argument, NULL, 'j' }, - { "log-level", required_argument, NULL, 'l' }, - { "unauthenticated", required_argument, NULL, 'u' }, - { "use-stderr", no_argument, NULL, 'e' }, - { "use-syslog", no_argument, NULL, 's' }, - { "version", no_argument, NULL, 'V' }, - { "xml-file", required_argument, NULL, 'x' }, - { NULL } -}; /** * Wrapper around printf() to take arguments like logmsg(). |