From 43bb8e9ed612ca8b4d241c648e5aa484e0eaab4c Mon Sep 17 00:00:00 2001 From: Gerhard Rieger Date: Wed, 24 Sep 2008 20:00:23 +0200 Subject: [PATCH] corrections with msg (fprintf) format parameters --- sysutils.c | 4 ++-- xioopts.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sysutils.c b/sysutils.c index 1f39c2d..ed1a1fa 100644 --- a/sysutils.c +++ b/sysutils.c @@ -548,7 +548,7 @@ int xiosetenv(const char *varname, const char *value, int overwrite) { for (i = 0; i < l; ++i) envname[i] = toupper(envname[i]); strncpy(envname+l+1, varname, XIO_ENVNAMELEN-1-l); if (Setenv(envname, value, overwrite) < 0) { - Warn3("setenv(\"...\", \"%s\", 1): %s", + Warn3("setenv(\"%s\", \"%s\", 1): %s", envname, value, strerror(errno)); Unsetenv(envname); /* dont want to have a wrong value */ return -1; @@ -577,7 +577,7 @@ int xiosetenv2(const char *varname, const char *varname2, const char *value, l += strlen(varname2); for (i = 0; i < l; ++i) envname[i] = toupper(envname[i]); if (Setenv(envname, value, overwrite) < 0) { - Warn3("setenv(\"...\", \"%s\", 1): %s", + Warn3("setenv(\"%s\", \"%s\", 1): %s", envname, value, strerror(errno)); Unsetenv(envname); /* dont want to have a wrong value */ return -1; diff --git a/xioopts.c b/xioopts.c index cb969b0..9d9e88d 100644 --- a/xioopts.c +++ b/xioopts.c @@ -2204,7 +2204,7 @@ int parseopts_table(const char **a, unsigned int groups, struct opt **opts, } Info4("setting option \"%s\" to %d:%d:\"%s\"", ent->desc->defname, (*opts)[i].value.u_int, (*opts)[i].value2.u_int, - (*opts)[i].value3.u_int); + (*opts)[i].value3.u_string); break; #if defined(HAVE_STRUCT_IP_MREQ) || defined (HAVE_STRUCT_IP_MREQN) case TYPE_IP_MREQN: @@ -2878,7 +2878,7 @@ int applyopts(int fd, struct opt *opts, unsigned int phase) { break; case TYPE_INT_INT: if (Ioctl_int(fd, opt->value.u_int, opt->value2.u_int) < 0) { - Error4("ioctl(%d, %d, %p): %s", + Error4("ioctl(%d, 0x%x, 0x%x): %s", fd, opt->value.u_int, opt->value2.u_int, strerror(errno)); opt->desc = ODESC_ERROR; ++opt; continue; }