diff options
| -rw-r--r-- | Makefile.nmake | 5 | ||||
| -rw-r--r-- | airpcap_loader.c | 2 | ||||
| -rw-r--r-- | capture-pcap-util-unix.c | 4 | ||||
| -rw-r--r-- | capture-wpcap.c | 6 | ||||
| -rw-r--r-- | nio-ie5.c | 4 | ||||
| -rw-r--r-- | rawshark.c | 2 | ||||
| -rw-r--r-- | tap-stats_tree.c | 4 | ||||
| -rw-r--r-- | util.c | 10 | ||||
| -rw-r--r-- | version_info.c | 82 | ||||
| -rw-r--r-- | wiretap/eyesdn.c | 22 |
10 files changed, 74 insertions, 67 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 793d6dbb72..622e05a5d8 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -1021,3 +1021,8 @@ clean-deps: $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean-deps cd .. +checkapi: + $(PERL) tools/checkAPIs.pl *.c +# $(wireshark_SOURCES) \ +# $(TSHARK_TAP_SRC) +# EXTRA_wireshark_SOURCES
\ No newline at end of file diff --git a/airpcap_loader.c b/airpcap_loader.c index c622d877ea..3faebe97ef 100644 --- a/airpcap_loader.c +++ b/airpcap_loader.c @@ -2539,7 +2539,7 @@ get_runtime_airpcap_version(GString *str) } g_PAirpcapGetVersion(&vmaj, &vmin, &vrev, &build); - g_string_sprintfa(str, "with AirPcap %d.%d.%d build %d", vmaj, vmin, + g_string_append_printf(str, "with AirPcap %d.%d.%d build %d", vmaj, vmin, vrev, build); } #endif /* HAVE_AIRPCAP */ diff --git a/capture-pcap-util-unix.c b/capture-pcap-util-unix.c index d707cc695a..26a45da0b1 100644 --- a/capture-pcap-util-unix.c +++ b/capture-pcap-util-unix.c @@ -345,7 +345,7 @@ get_compiled_pcap_version(GString *str) #ifdef HAVE_PCAP_VERSION extern char pcap_version[]; - g_string_sprintfa(str, "with libpcap %s", pcap_version); + g_string_append_printf(str, "with libpcap %s", pcap_version); #else g_string_append(str, "with libpcap (version unknown)"); #endif @@ -357,7 +357,7 @@ get_compiled_pcap_version(GString *str) void get_runtime_pcap_version(GString *str) { - g_string_sprintfa(str, "with "); + g_string_append_printf(str, "with "); #ifdef HAVE_PCAP_LIB_VERSION g_string_sprintfa(str, pcap_lib_version()); #else diff --git a/capture-wpcap.c b/capture-wpcap.c index 10d5cb8da5..a70116826d 100644 --- a/capture-wpcap.c +++ b/capture-wpcap.c @@ -768,9 +768,9 @@ get_runtime_pcap_version(GString *str) gchar *blankp; if (has_wpcap) { - g_string_sprintfa(str, "with "); + g_string_append_printf(str, "with "); if (p_pcap_lib_version != NULL) - g_string_sprintfa(str, p_pcap_lib_version()); + g_string_append_printf(str, p_pcap_lib_version()); else { /* * An alternative method of obtaining the version @@ -802,7 +802,7 @@ get_runtime_pcap_version(GString *str) g_module_close(handle); } } - g_string_sprintfa(str, "WinPcap (%s)", packetVer); + g_string_append_printf(str, "WinPcap (%s)", packetVer); } } else g_string_append(str, "without WinPcap"); @@ -1,4 +1,6 @@ -/* +/*
+ * $Id: util.c 24859 2008-04-09 05:36:08Z etxrab $
+ *
* Copyright (c) 2000, Red Hat, Inc. * * This program is free software; you can redistribute it and/or modify diff --git a/rawshark.c b/rawshark.c index 0768243527..7b23e847ac 100644 --- a/rawshark.c +++ b/rawshark.c @@ -400,7 +400,7 @@ set_link_type(const char *lt_arg) { encap = WTAP_ENCAP_USER0; pref_str = g_string_new("uat:user_dlts:"); /* This must match the format used in the user_dlts file */ - g_string_sprintfa(pref_str, + g_string_append_printf(pref_str, "\"User 0 (DLT=147)\",\"%s\",\"0\",\"\",\"0\",\"\"", spec_ptr); if (prefs_set_pref(pref_str->str) != PREFS_SET_OK) { diff --git a/tap-stats_tree.c b/tap-stats_tree.c index da4244b0a1..c912af9003 100644 --- a/tap-stats_tree.c +++ b/tap-stats_tree.c @@ -55,9 +55,9 @@ static void draw_stats_tree(void *psp) { s = g_string_new("\n===================================================================\n"); fmt = g_strdup_printf(" %%s%%-%us%%12s\t%%12s\t%%12s\n",stats_tree_branch_max_namelen(&st->root,0)); - g_string_sprintfa(s,fmt,"",st->cfg->name,"value","rate","percent"); + g_string_append_printf(s,fmt,"",st->cfg->name,"value","rate","percent"); g_free(fmt); - g_string_sprintfa(s,"-------------------------------------------------------------------\n"); + g_string_append_printf(s,"-------------------------------------------------------------------\n"); for (child = st->root.children; child; child = child->next ) { stats_tree_branch_to_str(child,s,0); @@ -152,14 +152,14 @@ const gchar *get_conn_cfilter(void) { if ((env = getenv("SSH_CONNECTION")) != NULL) { tokens = g_strsplit(env, " ", 4); if (tokens[3]) { - g_string_sprintf(filter_str, "not (tcp port %s and %s host %s " + g_string_printf(filter_str, "not (tcp port %s and %s host %s " "and tcp port %s and %s host %s)", tokens[1], host_ip_af(tokens[0]), tokens[0], tokens[3], host_ip_af(tokens[2]), tokens[2]); return filter_str->str; } } else if ((env = getenv("SSH_CLIENT")) != NULL) { tokens = g_strsplit(env, " ", 3); - g_string_sprintf(filter_str, "not (tcp port %s and %s host %s " + g_string_printf(filter_str, "not (tcp port %s and %s host %s " "and tcp port %s)", tokens[1], host_ip_af(tokens[0]), tokens[0], tokens[2]); return filter_str->str; } else if ((env = getenv("REMOTEHOST")) != NULL) { @@ -169,7 +169,7 @@ const gchar *get_conn_cfilter(void) { strcmp(env, "") == 0) { return ""; } - g_string_sprintf(filter_str, "not %s host %s", host_ip_af(env), env); + g_string_printf(filter_str, "not %s host %s", host_ip_af(env), env); return filter_str->str; } else if ((env = getenv("DISPLAY")) != NULL) { /* @@ -298,7 +298,7 @@ const gchar *get_conn_cfilter(void) { } } - g_string_sprintf(filter_str, "not %s host %s", + g_string_printf(filter_str, "not %s host %s", host_ip_af(phostname), phostname); g_free(phostname); return filter_str->str; @@ -314,7 +314,7 @@ const gchar *get_conn_cfilter(void) { * http://www.microsoft.com/technet/archive/termsrv/maintain/featusability/tsrvapi.mspx?mfr=true */ if (g_ascii_strncasecmp(env, "rdp", 3) == 0) { - g_string_sprintf(filter_str, "not tcp port 3389"); + g_string_printf(filter_str, "not tcp port 3389"); return filter_str->str; } } diff --git a/version_info.c b/version_info.c index f1f70c3222..97825c3da6 100644 --- a/version_info.c +++ b/version_info.c @@ -133,7 +133,7 @@ get_compiled_version_info(GString *str, void (*additional_info)(GString *)) { /* GLIB */ g_string_append(str, "with "); - g_string_sprintfa(str, + g_string_append_printf(str, #ifdef GLIB_MAJOR_VERSION "GLib %d.%d.%d", GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); @@ -196,9 +196,9 @@ get_epan_compiled_version_info(GString *str) g_string_append(str, "with libpcre "); #ifdef PCRE_MAJOR #ifdef PCRE_MINOR - g_string_sprintfa(str, "%u.%u", PCRE_MAJOR, PCRE_MINOR); + g_string_append_printf(str, "%u.%u", PCRE_MAJOR, PCRE_MINOR); #else /* PCRE_MINOR */ - g_string_sprintfa(str, "%u", PCRE_MAJOR); + g_string_append_printf(str, "%u", PCRE_MAJOR); #endif /* PCRE_MINOR */ #else /* PCRE_MAJOR */ g_string_append(str, "(version unknown)"); @@ -312,7 +312,7 @@ get_runtime_version_info(GString *str, void (*additional_info)(GString *)) case VER_PLATFORM_WIN32s: /* Shyeah, right. */ - g_string_sprintfa(str, "Windows 3.1 with Win32s"); + g_string_append_printf(str, "Windows 3.1 with Win32s"); break; case VER_PLATFORM_WIN32_WINDOWS: @@ -324,26 +324,26 @@ get_runtime_version_info(GString *str, void (*additional_info)(GString *)) switch (info.dwMinorVersion) { case 0: - g_string_sprintfa(str, "Windows 95"); + g_string_append_printf(str, "Windows 95"); break; case 10: - g_string_sprintfa(str, "Windows 98"); + g_string_append_printf(str, "Windows 98"); break; case 90: - g_string_sprintfa(str, "Windows Me"); + g_string_append_printf(str, "Windows Me"); break; default: - g_string_sprintfa(str, "Windows OT, unknown version %lu.%lu", + g_string_append_printf(str, "Windows OT, unknown version %lu.%lu", info.dwMajorVersion, info.dwMinorVersion); break; } break; default: - g_string_sprintfa(str, "Windows OT, unknown version %lu.%lu", + g_string_append_printf(str, "Windows OT, unknown version %lu.%lu", info.dwMajorVersion, info.dwMinorVersion); break; } @@ -355,7 +355,7 @@ get_runtime_version_info(GString *str, void (*additional_info)(GString *)) case 3: case 4: - g_string_sprintfa(str, "Windows NT %lu.%lu", + g_string_append_printf(str, "Windows NT %lu.%lu", info.dwMajorVersion, info.dwMinorVersion); break; @@ -364,49 +364,49 @@ get_runtime_version_info(GString *str, void (*additional_info)(GString *)) switch (info.dwMinorVersion) { case 0: - g_string_sprintfa(str, "Windows 2000"); + g_string_append_printf(str, "Windows 2000"); break; case 1: - g_string_sprintfa(str, "Windows XP"); + g_string_append_printf(str, "Windows XP"); break; case 2: - g_string_sprintfa(str, "Windows Server 2003"); + g_string_append_printf(str, "Windows Server 2003"); break; default: - g_string_sprintfa(str, "Windows NT, unknown version %lu.%lu", + g_string_append_printf(str, "Windows NT, unknown version %lu.%lu", info.dwMajorVersion, info.dwMinorVersion); break; } break; case 6: - g_string_sprintfa(str, "Windows Vista"); + g_string_append_printf(str, "Windows Vista"); break; default: - g_string_sprintfa(str, "Windows NT, unknown version %lu.%lu", + g_string_append_printf(str, "Windows NT, unknown version %lu.%lu", info.dwMajorVersion, info.dwMinorVersion); break; } break; default: - g_string_sprintfa(str, "Unknown Windows platform %lu version %lu.%lu", + g_string_append_printf(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", utf_16to8(info.szCSDVersion)); - g_string_sprintfa(str, ", build %lu", info.dwBuildNumber); + g_string_append_printf(str, " %s", utf_16to8(info.szCSDVersion)); + g_string_append_printf(str, ", build %lu", info.dwBuildNumber); #elif defined(HAVE_SYS_UTSNAME_H) /* * We have <sys/utsname.h>, so we assume we have "uname()". */ if (uname(&name) < 0) { - g_string_sprintfa(str, "unknown OS version (uname failed - %s)", + g_string_append_printf(str, "unknown OS version (uname failed - %s)", strerror(errno)); return; } @@ -419,7 +419,7 @@ get_runtime_version_info(GString *str, void (*additional_info)(GString *)) * version number and "name.release" be the minor * version number. */ - g_string_sprintfa(str, "%s %s.%s", name.sysname, name.version, + g_string_append_printf(str, "%s %s.%s", name.sysname, name.version, name.release); } else { /* @@ -430,7 +430,7 @@ get_runtime_version_info(GString *str, void (*additional_info)(GString *)) * On HP-UX, it appears to be some sort of subrevision * thing. */ - g_string_sprintfa(str, "%s %s", name.sysname, name.release); + g_string_append_printf(str, "%s %s", name.sysname, name.release); #ifdef HAVE_OS_X_FRAMEWORKS Gestalt(gestaltSystemVersion, &macosx_ver); @@ -440,12 +440,12 @@ get_runtime_version_info(GString *str, void (*additional_info)(GString *)) Gestalt(gestaltSystemVersionMinor, &macosx_minor_ver); Gestalt(gestaltSystemVersionBugFix, &macosx_bugfix_ver); - g_string_sprintfa(str, " (MacOS %ld.%ld.%ld)", + g_string_append_printf(str, " (MacOS %ld.%ld.%ld)", macosx_major_ver, macosx_minor_ver, macosx_bugfix_ver); } else { - g_string_sprintfa(str, " (MacOS X < 10.4 [%lx])", + g_string_append_printf(str, " (MacOS X < 10.4 [%lx])", macosx_ver); /* See Apple's Gestalt Manager Reference for meanings * of the macosx_ver values. */ @@ -479,56 +479,56 @@ get_runtime_version_info(GString *str, void (*additional_info)(GString *)) * string, we should probably prettify the number somehow. */ #if defined(__GNUC__) && defined(__VERSION__) - g_string_sprintfa(str, "\n\nBuilt using gcc %s.\n", __VERSION__); + g_string_append_printf(str, "\n\nBuilt using gcc %s.\n", __VERSION__); #elif defined(__HP_aCC) - g_string_sprintfa(str, "\n\nBuilt using HP aCC %d.\n", __HP_aCC); + g_string_append_printf(str, "\n\nBuilt using HP aCC %d.\n", __HP_aCC); #elif defined(__xlC__) - g_string_sprintfa(str, "\n\nBuilt using IBM XL C %d.%d\n", + g_string_append_printf(str, "\n\nBuilt using IBM XL C %d.%d\n", (__xlC__ >> 8) & 0xFF, __xlC__ & 0xFF); #ifdef __IBMC__ if ((__IBMC__ % 10) != 0) - g_string_sprintfa(str, " patch %d", __IBMC__ % 10); + g_string_append_printf(str, " patch %d", __IBMC__ % 10); #endif /* __IBMC__ */ - g_string_sprintfa(str, "\n"); + g_string_append_printf(str, "\n"); #elif defined(__INTEL_COMPILER) - g_string_sprintfa(str, "\n\nBuilt using Intel C %d.%d", + g_string_append_printf(str, "\n\nBuilt using Intel C %d.%d", __INTEL_COMPILER / 100, (__INTEL_COMPILER / 10) % 10); if ((__INTEL_COMPILER % 10) != 0) - g_string_sprintfa(str, " patch %d", __INTEL_COMPILER % 10); + g_string_append_printf(str, " patch %d", __INTEL_COMPILER % 10); #ifdef __INTEL_COMPILER_BUILD_DATE g_string_sprinta(str, ", compiler built %04d-%02d-%02d", __INTEL_COMPILER_BUILD_DATE / 10000, (__INTEL_COMPILER_BUILD_DATE / 100) % 100, __INTEL_COMPILER_BUILD_DATE % 100); #endif /* __INTEL_COMPILER_BUILD_DATE */ - g_string_sprintfa(str, "\n"); + g_string_append_printf(str, "\n"); #elif defined(_MSC_FULL_VER) if (_MSC_FULL_VER > 99999999) { - g_string_sprintfa(str, "\n\nBuilt using Microsoft Visual C++ %d.%d", + g_string_append_printf(str, "\n\nBuilt using Microsoft Visual C++ %d.%d", (_MSC_FULL_VER / 10000000) - 6, (_MSC_FULL_VER / 100000) % 100); if ((_MSC_FULL_VER % 100000) != 0) - g_string_sprintfa(str, " build %d", + g_string_append_printf(str, " build %d", _MSC_FULL_VER % 100000); } else { - g_string_sprintfa(str, "\n\nBuilt using Microsoft Visual C++ %d.%d", + g_string_append_printf(str, "\n\nBuilt using Microsoft Visual C++ %d.%d", (_MSC_FULL_VER / 1000000) - 6, (_MSC_FULL_VER / 10000) % 100); if ((_MSC_FULL_VER % 10000) != 0) - g_string_sprintfa(str, " build %d", + g_string_append_printf(str, " build %d", _MSC_FULL_VER % 10000); } - g_string_sprintfa(str, "\n"); + g_string_append_printf(str, "\n"); #elif defined(_MSC_VER) /* _MSC_FULL_VER not defined, but _MSC_VER defined */ - g_string_sprintfa(str, "\n\nBuilt using Microsoft Visual C++ %d.%d\n", + g_string_append_printf(str, "\n\nBuilt using Microsoft Visual C++ %d.%d\n", (_MSC_VER / 100) - 6, _MSC_VER % 100); #elif defined(__SUNPRO_C) - g_string_sprintfa(str, "\n\nBuilt using Sun C %d.%d", + g_string_append_printf(str, "\n\nBuilt using Sun C %d.%d", (__SUNPRO_C >> 8) & 0xF, (__SUNPRO_C >> 4) & 0xF); if ((__SUNPRO_C & 0xF) != 0) - g_string_sprintfa(str, " patch %d", __SUNPRO_C & 0xF); - g_string_sprintfa(str, "\n"); + g_string_append_printf(str, " patch %d", __SUNPRO_C & 0xF); + g_string_append_printf(str, "\n"); #endif end_string(str); diff --git a/wiretap/eyesdn.c b/wiretap/eyesdn.c index 3ea86e3395..534f72274c 100644 --- a/wiretap/eyesdn.c +++ b/wiretap/eyesdn.c @@ -65,7 +65,7 @@ static int esc_read(guint8 *buf, int len, FILE_T fh, int seekback) int err; if(seekback) cur_off = file_tell(fh); - else cur_off=0; // suppress uninitialized warning + else cur_off=0; /* suppress uninitialized warning */ for(i=0; i<len; i++) { value=file_getc(fh); @@ -271,33 +271,33 @@ parse_eyesdn_rec_hdr(wtap *wth, FILE_T fh, switch(direction >> 1) { default: - case EYESDN_ENCAP_ISDN: // ISDN + case EYESDN_ENCAP_ISDN: /* ISDN */ pseudo_header->isdn.uton = direction & 1; pseudo_header->isdn.channel = channel; - if(channel) { // bearer channels + if(channel) { /* bearer channels */ if(wth) { - wth->phdr.pkt_encap = WTAP_ENCAP_ISDN; // recognises PPP - pseudo_header->isdn.uton=!pseudo_header->isdn.uton; // bug + wth->phdr.pkt_encap = WTAP_ENCAP_ISDN; /* recognises PPP */ + pseudo_header->isdn.uton=!pseudo_header->isdn.uton; /* bug */ } - } else { // D channel + } else { /* D channel */ if(wth) { wth->phdr.pkt_encap = WTAP_ENCAP_ISDN; } } break; - case EYESDN_ENCAP_MSG: // Layer 1 message + case EYESDN_ENCAP_MSG: /* Layer 1 message */ if(wth) { wth->phdr.pkt_encap = WTAP_ENCAP_LAYER1_EVENT; } pseudo_header->l1event.uton = (direction & 1); break; - case EYESDN_ENCAP_LAPB: // X.25 via LAPB + case EYESDN_ENCAP_LAPB: /* X.25 via LAPB */ if(wth) { wth->phdr.pkt_encap = WTAP_ENCAP_LAPB; } pseudo_header->x25.flags = (direction & 1) ? 0 : 0x80; break; - case EYESDN_ENCAP_ATM: { // ATM cells + case EYESDN_ENCAP_ATM: { /* ATM cells */ #define CELL_LEN 53 unsigned char cell[CELL_LEN]; if(pkt_len != CELL_LEN) { @@ -322,11 +322,11 @@ parse_eyesdn_rec_hdr(wtap *wth, FILE_T fh, pseudo_header->atm.type=TRAF_UMTS_FP; pseudo_header->atm.subtype=TRAF_ST_UNKNOWN; pseudo_header->atm.vpi=((cell[0]&0xf)<<4) + (cell[0]&0xf); - pseudo_header->atm.vci=((cell[0]&0xf)<<4) + cell[0]; // from cell + pseudo_header->atm.vci=((cell[0]&0xf)<<4) + cell[0]; /* from cell */ pseudo_header->atm.channel=direction & 1; } break; - case EYESDN_ENCAP_MTP2: // SS7 frames + case EYESDN_ENCAP_MTP2: /* SS7 frames */ pseudo_header->mtp2.sent = direction & 1; pseudo_header->mtp2.annex_a_used = MTP2_ANNEX_A_USED_UNKNOWN; pseudo_header->mtp2.link_number = channel; |