Changeset 4020

Timestamp:

04/02/06 23:33:40 (3 years ago)

Author:

morris

Message:

Use wi_process_os_*() functions

Files:

• wire/trunk/config.h.in (modified) (1 diff)
• wire/trunk/configure (modified) (1 diff)
• wire/trunk/configure.in (modified) (1 diff)
• wire/trunk/wire/main.c (modified) (1 diff)
• wire/trunk/wire/version.c (modified) (2 diffs)

wire/trunk/config.h.in

@@ -78 +78 @@
-#undef WR_BUGREPORT
-
-/* Host CPU */
-#undef WR_CPU
-
-/* Protocol version */
-#undef WR_PROTOCOL_VERSION

wire/trunk/configure

@@ -1379 +1379 @@
-cat >>confdefs.h <<\_ACEOF
-#define WR_BUGREPORT "axel@zankasoftware.com"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define WR_CPU "$host_cpu"
-_ACEOF
-

wire/trunk/configure.in

@@ -12 +12 @@
-AC_DEFINE([WR_PROTOCOL_VERSION], ["1.1"], [Protocol version])
-AC_DEFINE([WR_BUGREPORT], ["AC_PACKAGE_BUGREPORT"], [Maintainer's email address])
-AC_DEFINE_UNQUOTED([WR_CPU], ["$host_cpu"], [Host CPU])
-
-# These are used in the Makefile

wire/trunk/wire/main.c

@@ -160 +160 @@
-        }
-        
+        wr_printf_prefix(WI_STR("%@"), wr_client_version_string);
+        
-        wi_release(pool);
-        pool = wi_pool_init(wi_pool_alloc());

wire/trunk/wire/version.c

@@ -29 +29 @@
-#include "config.h"
-
-#include <sys/utsname.h>
-#include <openssl/ssl.h>
-#include <readline/readline.h>
@@ -42 +41 @@
-
-void wr_init_version(void) {
-        struct utsname          name;
-        
-        uname(&name);
-        
-        wr_version_string                       = wi_string_init_with_cstring(wi_string_alloc(), WR_VERSION);
-        wr_protocol_version_string      = wi_string_init_with_cstring(wi_string_alloc(), WR_PROTOCOL_VERSION);
-s; %s; %s
+@; %@; %@
-                wr_version_string,
-name.sysname
-name.release
-WR_CPU
+wi_process_os_name(wi_process())
+wi_process_os_release(wi_process())
+wi_process_os_arch(wi_process())
-                SSLeay_version(SSLEAY_VERSION),
-                rl_library_version);