X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Futil.c;h=193efb9237c26fee14f85ee20ba0f08af3e6ef31;hb=f696f12fbe84f49d650f48c45ce1a24b94547ad2;hp=d6e470c92f55f5f041db20bf9ffd84ff46d1e275;hpb=d76f09ea77e03ee5a3a7bb67bcab1ac4bb54172b;p=openvswitch diff --git a/lib/util.c b/lib/util.c index d6e470c9..193efb92 100644 --- a/lib/util.c +++ b/lib/util.c @@ -158,8 +158,7 @@ ovs_fatal(int err_no, const char *format, ...) vfprintf(stderr, format, args); va_end(args); if (err_no != 0) - fprintf(stderr, " (%s)", - err_no == EOF ? "end of file" : strerror(err_no)); + fprintf(stderr, " (%s)", ovs_retval_to_string(err_no)); putc('\n', stderr); exit(EXIT_FAILURE); @@ -176,14 +175,40 @@ ovs_error(int err_no, const char *format, ...) vfprintf(stderr, format, args); va_end(args); if (err_no != 0) { - fprintf(stderr, " (%s)", - err_no == EOF ? "end of file" : strerror(err_no)); + fprintf(stderr, " (%s)", ovs_retval_to_string(err_no)); } putc('\n', stderr); errno = save_errno; } +/* Many OVS functions return an int which is one of: + * - 0: no error yet + * - >0: errno value + * - EOF: end of file (not necessarily an error; depends on the function called) + * + * Returns the appropriate human-readable string. The caller must copy the + * string if it wants to hold onto it, as the storage may be overwritten on + * subsequent function calls. + */ +const char * +ovs_retval_to_string(int retval) +{ + static char unknown[48]; + + if (!retval) { + return ""; + } + if (retval > 0) { + return strerror(retval); + } + if (retval == EOF) { + return "End of file"; + } + snprintf(unknown, sizeof unknown, "***unknown return value: %d***", retval); + return unknown; +} + /* Sets program_name based on 'argv0'. Should be called at the beginning of * main(), as "set_program_name(argv[0]);". */ void set_program_name(const char *argv0)