diff options
author | Ole Loots <ole@monochrom.net> | 2013-01-31 19:28:26 +0100 |
---|---|---|
committer | Ole Loots <ole@monochrom.net> | 2013-01-31 19:28:26 +0100 |
commit | 0703404654d2a40cacae2d94c6e0e22ca28b4acf (patch) | |
tree | bfdbe1e8952814f73a6b0e190ae0a77fd0cfc7bd /utils/useragent.c | |
parent | 54f719aa960159c5b1978846223732c9669ca7fa (diff) | |
parent | 89856f55929907642013e45435b9d18cd1fafe36 (diff) | |
download | netsurf-0703404654d2a40cacae2d94c6e0e22ca28b4acf.tar.gz netsurf-0703404654d2a40cacae2d94c6e0e22ca28b4acf.tar.bz2 |
Merge branch 'master' into mono/removing-windom-dependencymono/removing-windom-dependency
Conflicts:
atari/toolbar.c
Diffstat (limited to 'utils/useragent.c')
-rw-r--r-- | utils/useragent.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/utils/useragent.c b/utils/useragent.c index 5b8c9e10f..91f43636c 100644 --- a/utils/useragent.c +++ b/utils/useragent.c @@ -29,7 +29,7 @@ static const char *core_user_agent_string = NULL; #ifndef NETSURF_UA_FORMAT_STRING -#define NETSURF_UA_FORMAT_STRING "NetSurf/%d.%d (%s; %s)" +#define NETSURF_UA_FORMAT_STRING "NetSurf/%d.%d (%s)" #endif /** @@ -41,20 +41,17 @@ user_agent_build_string(void) { struct utsname un; const char *sysname = "Unknown"; - const char *machine = "Unknown"; char *ua_string; int len; if (uname(&un) >= 0) { sysname = un.sysname; - machine = un.machine; } len = snprintf(NULL, 0, NETSURF_UA_FORMAT_STRING, netsurf_version_major, netsurf_version_minor, - sysname, - machine); + sysname); ua_string = malloc(len + 1); if (!ua_string) { /** \todo this needs handling better */ @@ -64,8 +61,7 @@ user_agent_build_string(void) NETSURF_UA_FORMAT_STRING, netsurf_version_major, netsurf_version_minor, - sysname, - machine); + sysname); core_user_agent_string = ua_string; |