Page MenuHomeFreeBSD
Files F153297523

D40099.diff
No OneTemporary
Actions

D40099.diff
View Options

diff --git a/usr.bin/kdump/kdump.h b/usr.bin/kdump/kdump.h
--- a/usr.bin/kdump/kdump.h
+++ b/usr.bin/kdump/kdump.h
@@ -34,7 +34,7 @@
extern bool decimal, fancy, resolv;
-#define print_number64(first,i,n,c) do { \
+#define _print_number64(first,i,n,c,d) do { \
uint64_t __v; \
\
if (quad_align && (((ptrdiff_t)((i) - (first))) & 1) == 1) { \
@@ -46,7 +46,7 @@
((uint64_t)(uint32_t)(i)[1]) << 32; \
else \
__v = (uint64_t)*(i); \
- if (decimal) \
+ if (d) \
printf("%c%jd", (c), (intmax_t)__v); \
else \
printf("%c%#jx", (c), (uintmax_t)__v); \
@@ -55,8 +55,8 @@
(c) = ','; \
} while (0)
-#define print_number(i,n,c) do { \
- if (decimal) \
+#define _print_number(i,n,c,d) do { \
+ if (d) \
printf("%c%jd", c, (intmax_t)*i); \
else \
printf("%c%#jx", c, (uintmax_t)(u_register_t)*i); \
@@ -65,6 +65,11 @@
c = ','; \
} while (0)
+#define print_number(i,n,c) _print_number(i,n,c,decimal)
+#define print_decimal_number(i,n,c) _print_number(i,n,c,true)
+#define print_number64(first,i,n,c) _print_number64(first,i,n,c,decimal)
+#define print_decimal_number64(first,i,n,c) _print_number64(first,i,n,c,true)
+
void decode_filemode(int value);
void print_integer_arg(const char *(*decoder)(int), int value);
void print_integer_arg_valid(const char *(*decoder)(int), int value);
diff --git a/usr.bin/kdump/linux.c b/usr.bin/kdump/linux.c
--- a/usr.bin/kdump/linux.c
+++ b/usr.bin/kdump/linux.c
@@ -202,7 +202,7 @@
case LINUX_SYS_linux_kill:
case LINUX_SYS_linux_tkill:
case LINUX_SYS_linux_rt_sigqueueinfo:
- print_number(ip, narg, c);
+ print_decimal_number(ip, narg, c);
putchar(',');
print_linux_signal(*ip);
ip++;
@@ -210,8 +210,8 @@
break;
case LINUX_SYS_linux_tgkill:
case LINUX_SYS_linux_rt_tgsigqueueinfo:
- print_number(ip, narg, c);
- print_number(ip, narg, c);
+ print_decimal_number(ip, narg, c);
+ print_decimal_number(ip, narg, c);
putchar(',');
print_linux_signal(*ip);
ip++;
@@ -411,7 +411,7 @@
case LINUX32_SYS_linux_kill:
case LINUX32_SYS_linux_tkill:
case LINUX32_SYS_linux_rt_sigqueueinfo:
- print_number(ip, narg, c);
+ print_decimal_number(ip, narg, c);
putchar(',');
print_linux_signal(*ip);
ip++;
@@ -419,8 +419,8 @@
break;
case LINUX32_SYS_linux_tgkill:
case LINUX32_SYS_linux_rt_tgsigqueueinfo:
- print_number(ip, narg, c);
- print_number(ip, narg, c);
+ print_decimal_number(ip, narg, c);
+ print_decimal_number(ip, narg, c);
putchar(',');
print_linux_signal(*ip);
ip++;

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 21, 7:58 AM (8 h, 27 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31898271
Default Alt Text
D40099.diff (2 KB)

Event Timeline