>From bcf1c5847fc59430f48a8e44d50c9cb3df431f6a Mon Sep 17 00:00:00 2001
From: Tamas TEVESZ <[email protected]>
Date: Sat, 20 Mar 2010 14:53:57 +0100
Subject: [PATCH] Trivial format string fixes
---
src/misc.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/misc.c b/src/misc.c
index 777e675..a7de66b 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -611,7 +611,7 @@ char *ExpandOptions(WScreen * scr, char *cmdline)
olen = len + 1;
out = malloc(olen);
if (!out) {
- wwarning(_("out of memory during expansion of \"%s\""));
+ wwarning(_("out of memory during expansion of \"%s\""),
cmdline);
return NULL;
}
*out = 0;
@@ -664,7 +664,7 @@ char *ExpandOptions(WScreen * scr, char *cmdline)
olen += slen;
nout = realloc(out, olen);
if (!nout) {
- wwarning(_("out of memory
during expansion of \"%w\""));
+ wwarning(_("out of memory
during expansion of \"%%w\""));
goto error;
}
out = nout;
@@ -681,7 +681,7 @@ char *ExpandOptions(WScreen * scr, char *cmdline)
olen += slen;
nout = realloc(out, olen);
if (!nout) {
- wwarning(_("out of memory during
expansion of \"%W\""));
+ wwarning(_("out of memory during
expansion of \"%%W\""));
goto error;
}
out = nout;
@@ -698,7 +698,7 @@ char *ExpandOptions(WScreen * scr, char *cmdline)
olen += slen;
nout = realloc(out, olen);
if (!nout) {
- wwarning(_("out of memory
during expansion of \"%a\""));
+ wwarning(_("out of memory
during expansion of \"%%a\""));
goto error;
}
out = nout;
@@ -727,7 +727,7 @@ char *ExpandOptions(WScreen * scr, char *cmdline)
olen += slen;
nout = realloc(out, olen);
if (!nout) {
- wwarning(_("out of memory during
expansion of \"%d\""));
+ wwarning(_("out of memory during
expansion of \"%%d\""));
goto error;
}
out = nout;
@@ -748,7 +748,7 @@ char *ExpandOptions(WScreen * scr, char *cmdline)
olen += slen;
nout = realloc(out, olen);
if (!nout) {
- wwarning(_("out of memory during
expansion of \"%s\""));
+ wwarning(_("out of memory during
expansion of \"%%s\""));
goto error;
}
out = nout;
--
1.7.0
--
[-]
mkdir /nonexistentFrom bcf1c5847fc59430f48a8e44d50c9cb3df431f6a Mon Sep 17 00:00:00 2001
From: Tamas TEVESZ <[email protected]>
Date: Sat, 20 Mar 2010 14:53:57 +0100
Subject: [PATCH] Trivial format string fixes
---
src/misc.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/misc.c b/src/misc.c
index 777e675..a7de66b 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -611,7 +611,7 @@ char *ExpandOptions(WScreen * scr, char *cmdline)
olen = len + 1;
out = malloc(olen);
if (!out) {
- wwarning(_("out of memory during expansion of \"%s\""));
+ wwarning(_("out of memory during expansion of \"%s\""), cmdline);
return NULL;
}
*out = 0;
@@ -664,7 +664,7 @@ char *ExpandOptions(WScreen * scr, char *cmdline)
olen += slen;
nout = realloc(out, olen);
if (!nout) {
- wwarning(_("out of memory during expansion of \"%w\""));
+ wwarning(_("out of memory during expansion of \"%%w\""));
goto error;
}
out = nout;
@@ -681,7 +681,7 @@ char *ExpandOptions(WScreen * scr, char *cmdline)
olen += slen;
nout = realloc(out, olen);
if (!nout) {
- wwarning(_("out of memory during expansion of \"%W\""));
+ wwarning(_("out of memory during expansion of \"%%W\""));
goto error;
}
out = nout;
@@ -698,7 +698,7 @@ char *ExpandOptions(WScreen * scr, char *cmdline)
olen += slen;
nout = realloc(out, olen);
if (!nout) {
- wwarning(_("out of memory during expansion of \"%a\""));
+ wwarning(_("out of memory during expansion of \"%%a\""));
goto error;
}
out = nout;
@@ -727,7 +727,7 @@ char *ExpandOptions(WScreen * scr, char *cmdline)
olen += slen;
nout = realloc(out, olen);
if (!nout) {
- wwarning(_("out of memory during expansion of \"%d\""));
+ wwarning(_("out of memory during expansion of \"%%d\""));
goto error;
}
out = nout;
@@ -748,7 +748,7 @@ char *ExpandOptions(WScreen * scr, char *cmdline)
olen += slen;
nout = realloc(out, olen);
if (!nout) {
- wwarning(_("out of memory during expansion of \"%s\""));
+ wwarning(_("out of memory during expansion of \"%%s\""));
goto error;
}
out = nout;
--
1.7.0