diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2022-09-10 15:13:28 -0500 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2022-09-10 15:39:38 -0500 |
| commit | 2bf63fcba72c4f4bc54a4caf53d7923c1f9f174f (patch) | |
| tree | a466361955cef6e34765fbec4734d91d23029222 /rmt | |
| parent | 9ae062098da4383a6c9b39e245c1a2888a645352 (diff) | |
| download | paxutils-2bf63fcba72c4f4bc54a4caf53d7923c1f9f174f.tar.gz | |
Modernize integer handling
It’s now safe to assume C99 sprintf %jd, etc.
* am/system.m4 (PU_SYSTEM): Do not require gl_INTTOSTR.
* gnulib.modules, paxlib.modules:
Remove inttostr. Add strtoimax, strtoumax.
* lib/system.h (UINTMAX_STRSIZE_BOUND): Remove.
* paxlib/error.c (chown_error_details, read_error_details)
(read_warn_details, read_fatal_details, seek_error_details)
(seek_warn_details, write_error_details):
* paxlib/rtape.c (rmt_read, rmt_write, rmt_lseek, rmt_ioctl):
* rmt/rmt.c (rmt_reply):
* tests/genfile.c (verify_file, print_stat):
Use C99 printf formats instead of doing it by hand.
* paxlib/paxlib.h, rmt/rmt.c, tests/genfile.c:
Do not include inttostr.h.
* paxlib/paxlib.h (STRINGIFY_BIGINT): Remove.
* tests/argcv.c (xtonum): Use strtol for signed int, not strtoul.
* tests/genfile.c (checkpoint, verify_file, parse_opt)
(exec_checkpoint, process_checkpoint, exec_command):
Prefer uintmax_t to size_t for counters unrelated to object size.
(PRINT_INT): New macro.
(print_stat): Prefer uintmax_t to unsigned for modes.
Diffstat (limited to 'rmt')
| -rw-r--r-- | rmt/rmt.c | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -22,7 +22,6 @@ #include <getopt.h> #include <full-write.h> #include <configmake.h> -#include <inttostr.h> #include <error.h> #include <progname.h> #include <c-ctype.h> @@ -111,8 +110,7 @@ rmt_write (const char *fmt, ...) static void rmt_reply (uintmax_t code) { - char buf[UINTMAX_STRSIZE_BOUND]; - rmt_write ("A%s\n", umaxtostr (code, buf)); + rmt_write ("A%ju\n", code); } static void @@ -247,7 +245,7 @@ decode_open_flag (const char *mstr, int *pmode) while (mstr) { int v; - + mstr = skip_ws (mstr); if (*mstr == 0) break; @@ -260,7 +258,7 @@ decode_open_flag (const char *mstr, int *pmode) } mode |= v; - + if (*p && c_isblank (*p)) p = skip_ws (p); if (*p == 0) @@ -310,7 +308,7 @@ decode_open_flag (const char *mstr, int *pmode) In addition, a compined form is also allowed, i.e. a decimal mode followed by its symbolic representation. In this case the symbolic representation is given preference. - + Reply ----- A0\n on success, E0\n<msg>\n on error. |