fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-28 05:10:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

os: support %% in pnprintf

Browse source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 58ef34ee6d)
This commit is contained in:
Peter Hutterer 2013-02-14 16:13:22 +10:00
parent b606767f20
commit 6da756fb1d
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
os/log.c
View file

@ -450,6 +450,9 @@ pnprintf(char *string, size_t size, const char *f, va_list args)
string[s_idx++] = number[i];
}
break;
case '%':
string[s_idx++] = '%';
break;
default:
va_arg(args, char*);
string[s_idx++] = '%';

5
test/signal-logging.c
View file

@ -196,6 +196,11 @@ static void logging_format(void)
read_log_msg(logmsg);
assert(strcmp(logmsg, "(EE) %s %d %u %% %p %i\n") == 0);
/* literal % */
LogMessageVerbSigSafe(X_ERROR, -1, "test %%\n");
read_log_msg(logmsg);
assert(strcmp(logmsg, "(EE) test %\n") == 0);
/* string substitution */
LogMessageVerbSigSafe(X_ERROR, -1, "%s\n", "substituted string");
read_log_msg(logmsg);