denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support field with specifiers in %N printf hook

Browse Source
This commit is contained in:
Martin Willi
2012-10-24 11:34:30 +02:00
parent fc4d1568d1
commit 2232d88569
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/enum.c
+7 -5
View File
@@ -65,15 +65,17 @@ int enum_printf_hook(printf_hook_data_t *data, printf_hook_spec_t *spec,
{ {
enum_name_t *ed = *((enum_name_t**)(args[0])); enum_name_t *ed = *((enum_name_t**)(args[0]));
int val = *((int*)(args[1])); int val = *((int*)(args[1]));
char *name, buf[32];
char *name = enum_to_name(ed, val); name = enum_to_name(ed, val);
if (name == NULL) if (name == NULL)
{ {
return print_in_hook(data, "(%d)", val); snprintf(buf, sizeof(buf), "(%d)", val);
name = buf;
} }
else if (spec->minus)
{ {
return print_in_hook(data, "%s", name); return print_in_hook(data, "%-*s", spec->width, name);
} }
return print_in_hook(data, "%*s", spec->width, name);
} }