diff options
author | Gerald Combs <gerald@wireshark.org> | 2003-11-02 23:12:35 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2003-11-02 23:12:35 +0000 |
commit | 031db8b9c87e9f096a377547dfbf6266958fa6cd (patch) | |
tree | b9ceb9b8cc87f48bc800f3b66eb28fb37398cb09 /util.c | |
parent | b8d155186ccf09f303c0f7196f09484bf6c9a674 (diff) |
From Gisle Vanem:
* Added a new function get_file_in_temp() to
epan/filesystem.c. This because of asn1.dll plugin which
had code to write to a log-file "c:\temp\ethereal.log". I feel
this patch makes this safer; I don't even have a c:\temp dir.
* Patched packet-asn1.c to use get_file_in_temp().
* Added some #undef to packet-snmp.c to silence gcc.
* Changed "%u" -> "%lu" formats in util.c
Rename get_file_in_temp() to get_tempfile_path() to match other function
names.
svn path=/trunk/; revision=8859
Diffstat (limited to 'util.c')
-rw-r--r-- | util.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -1,7 +1,7 @@ /* util.c * Utility routines * - * $Id: util.c,v 1.70 2003/10/31 07:57:22 guy Exp $ + * $Id: util.c,v 1.71 2003/11/02 23:12:32 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -237,14 +237,14 @@ get_runtime_version_info(GString *str) break; default: - g_string_sprintfa(str, "Windows OT, unknown version %u.%u", + g_string_sprintfa(str, "Windows OT, unknown version %lu.%lu", info.dwMajorVersion, info.dwMinorVersion); break; } break; default: - g_string_sprintfa(str, "Windows OT, unknown version %u.%u", + g_string_sprintfa(str, "Windows OT, unknown version %lu.%lu", info.dwMajorVersion, info.dwMinorVersion); break; } @@ -256,7 +256,7 @@ get_runtime_version_info(GString *str) case 3: case 4: - g_string_sprintfa(str, "Windows NT %u.%u", + g_string_sprintfa(str, "Windows NT %lu.%lu", info.dwMajorVersion, info.dwMinorVersion); break; @@ -277,27 +277,27 @@ get_runtime_version_info(GString *str) break; default: - g_string_sprintfa(str, "Windows NT, unknown version %u.%u", + g_string_sprintfa(str, "Windows NT, unknown version %lu.%lu", info.dwMajorVersion, info.dwMinorVersion); break; } break; default: - g_string_sprintfa(str, "Windows NT, unknown version %u.%u", + g_string_sprintfa(str, "Windows NT, unknown version %lu.%lu", info.dwMajorVersion, info.dwMinorVersion); break; } break; default: - g_string_sprintfa(str, "Unknown Windows platform %u version %u.%u", + g_string_sprintfa(str, "Unknown Windows platform %lu version %lu.%lu", info.dwPlatformId, info.dwMajorVersion, info.dwMinorVersion); break; } if (info.szCSDVersion[0] != '\0') g_string_sprintfa(str, " %s", info.szCSDVersion); - g_string_sprintfa(str, ", build %u", info.dwBuildNumber); + g_string_sprintfa(str, ", build %lu", info.dwBuildNumber); #elif defined(HAVE_SYS_UTSNAME_H) /* * We have <sys/utsname.h>, so we assume we have "uname()". |