diff options
| author | Roy Marples <roy@marples.name> | 2008-10-08 15:56:47 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2008-10-08 15:56:47 +0000 |
| commit | 8c8751fa60b529d190ca85857096cf741b0436de (patch) | |
| tree | 4913d50a861ff45947d26fa75a29a97945536223 /src/rc | |
| parent | 5cdc4895733ce3a723a5a58686a4d92a3c69c953 (diff) | |
Clean up warnings regarding printf.
Diffstat (limited to 'src/rc')
| -rw-r--r-- | src/rc/rc-applets.c | 11 | ||||
| -rw-r--r-- | src/rc/runscript.c | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/rc/rc-applets.c b/src/rc/rc-applets.c index f5892f98..eea4a01d 100644 --- a/src/rc/rc-applets.c +++ b/src/rc/rc-applets.c @@ -84,8 +84,8 @@ static int do_e(int argc, char **argv) int level = 0; struct timespec ts; struct timeval stop, now; - int (*e) (const char *, ...) __EINFO_PRINTF = NULL; - int (*ee) (int, const char *, ...) __EEND_PRINTF = NULL; + int (*e) (const char *, ...) EINFO_PRINTF(1, 2) = NULL; + int (*ee) (int, const char *, ...) EINFO_PRINTF(2, 3) = NULL; /* Punt applet */ argc--; @@ -205,9 +205,10 @@ static int do_e(int argc, char **argv) ee = eend; else if (strcmp(applet, "ewend") == 0) ee = ewend; - else if (strcmp(applet, "esyslog") == 0) - ee = elog; - else if (strcmp(applet, "veinfo") == 0) + else if (strcmp(applet, "esyslog") == 0) { + elog(retval, "%s", message); + retval = 0; + } else if (strcmp(applet, "veinfo") == 0) e = einfov; else if (strcmp(applet, "veinfon") == 0) e = einfovn; diff --git a/src/rc/runscript.c b/src/rc/runscript.c index 6dea2b2b..e263a4f4 100644 --- a/src/rc/runscript.c +++ b/src/rc/runscript.c @@ -557,7 +557,7 @@ static bool svc_wait(const char *svc) static RC_SERVICE svc_status(void) { char status[10]; - int (*e) (const char *fmt, ...) __EINFO_PRINTF = einfo; + int (*e) (const char *fmt, ...) EINFO_PRINTF(1, 2) = einfo; RC_SERVICE state = rc_service_state(service); if (state & RC_SERVICE_STOPPING) { |