diff --git a/AUTHORS b/AUTHORS index 6abb078732e..90789d10f66 100644 --- a/AUTHORS +++ b/AUTHORS @@ -144,6 +144,7 @@ Mark D. Gray mark.d.gray@intel.com Mark Hamilton mhamilton@nicira.com Mark Kavanagh mark.b.kavanagh@intel.com Mark Maglana mmaglana@gmail.com +Markos Chandras mchandras@suse.de Martin Casado casado@nicira.com Martino Fornasa mf@fornasa.it Maryam Tahhan maryam.tahhan@intel.com diff --git a/include/openvswitch/util.h b/include/openvswitch/util.h index 2230b2a0cdf..363fa39b6cb 100644 --- a/include/openvswitch/util.h +++ b/include/openvswitch/util.h @@ -25,11 +25,7 @@ extern "C" { #endif -void ovs_set_program_name__(const char *name, const char *version, - const char *date, const char *time); - -#define ovs_set_program_name(name, version) \ - ovs_set_program_name__(name, version, __DATE__, __TIME__) +void ovs_set_program_name(const char *name, const char *version); const char *ovs_get_program_name(void); const char *ovs_get_program_version(void); diff --git a/lib/util.c b/lib/util.c index 94311ac6af3..6ca04ad88ac 100644 --- a/lib/util.c +++ b/lib/util.c @@ -461,14 +461,9 @@ ovs_strerror(int error) * vSwitch. Otherwise, it is assumed to be an external program linking against * the Open vSwitch libraries. * - * The 'date' and 'time' arguments should likely be called with - * "__DATE__" and "__TIME__" to use the time the binary was built. - * Alternatively, the "ovs_set_program_name" macro may be called to do this - * automatically. */ void -ovs_set_program_name__(const char *argv0, const char *version, const char *date, - const char *time) +ovs_set_program_name(const char *argv0, const char *version) { char *basename; #ifdef _WIN32 @@ -496,14 +491,12 @@ ovs_set_program_name__(const char *argv0, const char *version, const char *date, free(program_version); if (!strcmp(version, VERSION)) { - program_version = xasprintf("%s (Open vSwitch) "VERSION"\n" - "Compiled %s %s\n", - program_name, date, time); + program_version = xasprintf("%s (Open vSwitch) "VERSION"\n", + program_name); } else { program_version = xasprintf("%s %s\n" - "Open vSwitch Library "VERSION"\n" - "Compiled %s %s\n", - program_name, version, date, time); + "Open vSwitch Library "VERSION"\n", + program_name, version); } }