mirror of
https://github.com/moparisthebest/socat
synced 2024-12-21 22:48:48 -05:00
corrections with msg (fprintf) format parameters
This commit is contained in:
parent
3684e5daa0
commit
43bb8e9ed6
@ -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;
|
||||
|
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user