bcollet/socat
1
0
Fork 0
mirror of https://repo.or.cz/socat.git synced 2024-12-23 07:52:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

corrections with msg (fprintf) format parameters

Browse source
This commit is contained in:
Gerhard Rieger 2008-09-24 20:00:23 +02:00
parent 3684e5daa0
commit 43bb8e9ed6
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sysutils.c
View file

@ -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]); for (i = 0; i < l; ++i) envname[i] = toupper(envname[i]);
strncpy(envname+l+1, varname, XIO_ENVNAMELEN-1-l); strncpy(envname+l+1, varname, XIO_ENVNAMELEN-1-l);
if (Setenv(envname, value, overwrite) < 0) { if (Setenv(envname, value, overwrite) < 0) {
Warn3("setenv(\"...\", \"%s\", 1): %s", Warn3("setenv(\"%s\", \"%s\", 1): %s",
envname, value, strerror(errno)); envname, value, strerror(errno));
Unsetenv(envname); /* dont want to have a wrong value */ Unsetenv(envname); /* dont want to have a wrong value */
return -1; return -1;
@ -577,7 +577,7 @@ int xiosetenv2(const char *varname, const char *varname2, const char *value,
l += strlen(varname2); l += strlen(varname2);
for (i = 0; i < l; ++i) envname[i] = toupper(envname[i]); for (i = 0; i < l; ++i) envname[i] = toupper(envname[i]);
if (Setenv(envname, value, overwrite) < 0) { if (Setenv(envname, value, overwrite) < 0) {
Warn3("setenv(\"...\", \"%s\", 1): %s", Warn3("setenv(\"%s\", \"%s\", 1): %s",
envname, value, strerror(errno)); envname, value, strerror(errno));
Unsetenv(envname); /* dont want to have a wrong value */ Unsetenv(envname); /* dont want to have a wrong value */
return -1; return -1;

4
xioopts.c
View file

@ -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, Info4("setting option \"%s\" to %d:%d:\"%s\"", ent->desc->defname,
(*opts)[i].value.u_int, (*opts)[i].value2.u_int, (*opts)[i].value.u_int, (*opts)[i].value2.u_int,
(*opts)[i].value3.u_int); (*opts)[i].value3.u_string);
break; break;
#if defined(HAVE_STRUCT_IP_MREQ) || defined (HAVE_STRUCT_IP_MREQN) #if defined(HAVE_STRUCT_IP_MREQ) || defined (HAVE_STRUCT_IP_MREQN)
case TYPE_IP_MREQN: case TYPE_IP_MREQN:
@ -2878,7 +2878,7 @@ int applyopts(int fd, struct opt *opts, unsigned int phase) {
break; break;
case TYPE_INT_INT: case TYPE_INT_INT:
if (Ioctl_int(fd, opt->value.u_int, opt->value2.u_int) < 0) { 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)); fd, opt->value.u_int, opt->value2.u_int, strerror(errno));
opt->desc = ODESC_ERROR; ++opt; continue; opt->desc = ODESC_ERROR; ++opt; continue;
} }