Some 'no previous declararion' warning fixes

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@15355 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/capture_sync.c b/capture_sync.c
index 083a9f2669de05004d2bd73ffc10a73bb98127a3..071bcd6440d2d614654a854686789177c397bdf8 100644 (file)
--- a/capture_sync.c
+++ b/capture_sync.c
@@ -165,7 +165,7 @@ pipe_write_block(int pipe, char indicator, int len, const char *msg)
 /* read a message from the sending pipe in the standard format 
    (3 digit message length (excluding length and indicator field), 
    1 byte message indicator and the rest is the message) */
-int
+static int
 pipe_read_block(int pipe, char *indicator, int len, char *msg) {
     int required;
     int newly;

diff --git a/color_filters.c b/color_filters.c
index ff8d43339aea486502ddac01c2ef0f8b908c2832..8ee7e50752853429d3b81ab1a6903430f8ba6d4f 100644 (file)
--- a/color_filters.c
+++ b/color_filters.c
@@ -456,7 +456,7 @@ write_filter(gpointer filter_arg, gpointer data_arg)
 }
 
 /* save filters in a filter file */
-gboolean
+static gboolean
 write_filters_file(FILE *f, gboolean only_marked)
 {
        struct write_filter_data data;

diff --git a/epan/dissectors/ncp2222.py b/epan/dissectors/ncp2222.py
index 5e156ccf6264a00d9874cb0b0053fe0f0b1fbb62..0b285e85441d5a74f2638ecbcf5aeb692c8d9c55 100644 (file)
--- a/epan/dissectors/ncp2222.py
+++ b/epan/dissectors/ncp2222.py
@@ -6341,7 +6341,7 @@ static int hf_nds_segment_error = -1;
 
        # final_registration_ncp2222()
        print """
-void
+static void
 final_registration_ncp2222(void)
 {
        int i;

diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c
index dc2937d48f7f996ecac1fb9a7e21edf50faa7b71..721357bf40b751a6d8d76052ca5420ba1505bbb0 100644 (file)
--- a/epan/dissectors/packet-atalk.c
+++ b/epan/dissectors/packet-atalk.c
@@ -44,6 +44,7 @@
 #include <epan/reassemble.h>
 #include <epan/emem.h>
 
+#include "packet-atalk.h"
 #include "packet-afp.h"
 
 /* Tables for reassembly of fragments. */

diff --git a/epan/dissectors/packet-atalk.h b/epan/dissectors/packet-atalk.h
index 592dd1948ed27ef7057d7f5cfe3778f1618b75f9..ab145dc0aadbb1fe8857427268d2040b312f4ebe 100644 (file)
--- a/epan/dissectors/packet-atalk.h
+++ b/epan/dissectors/packet-atalk.h
@@ -21,33 +21,6 @@
 #ifndef __PACKET_ATALK_H__
 #define __PACKET_ATALK_H__
 
-/*
- * Structure used to represent a DDP address; gives the layout of the
- * data pointed to by an AT_ATALK "address" structure.
- */
-struct atalk_ddp_addr {
-       guint16 net;
-       guint8  node;
-       guint8  port;
-};
-
-/*
- * DDP packet types.
- */
-#define DDP_RTMPDATA   0x01
-#define DDP_NBP                0x02
-#define DDP_ATP                0x03
-#define DDP_AEP                0x04
-#define DDP_RTMPREQ    0x05
-#define DDP_ZIP                0x06
-#define DDP_ADSP       0x07
-#define DDP_EIGRP      0x58
-
-/*
- * Routine to take a DDP address and generate a string.
- */
-extern gchar *atalk_addr_to_str(const struct atalk_ddp_addr *addrp);
-
 extern void capture_llap(packet_counts *ld);
 
 #endif

diff --git a/epan/dissectors/packet-dcerpc-samr.c b/epan/dissectors/packet-dcerpc-samr.c
index 4527455675416e932f8b1f214d36e6a28b6a21b7..af4e65ccfca01f6eacf6f7867ac25fd71ef45366 100644 (file)
--- a/epan/dissectors/packet-dcerpc-samr.c
+++ b/epan/dissectors/packet-dcerpc-samr.c
@@ -239,7 +239,7 @@ struct access_mask_info samr_connect_access_mask_info = {
 };
 
 
-int
+static int
 sam_dissect_SAM_SECURITY_DESCRIPTOR_data(tvbuff_t *tvb, int offset,
                              packet_info *pinfo, proto_tree *tree,
                              guint8 *drep)
@@ -267,7 +267,7 @@ sam_dissect_SAM_SECURITY_DESCRIPTOR_data(tvbuff_t *tvb, int offset,
        return offset;
 }
 
-int
+static int
 sam_dissect_SAM_SECURITY_DESCRIPTOR(tvbuff_t *tvb, int offset,
                        packet_info *pinfo, proto_tree *parent_tree,
                        guint8 *drep)

diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c
index d6e3adac7803108c7dbb69eed725d17151b2be70..7984f9e227b077f231a1c4ae89d27458062d7ff8 100644 (file)
--- a/epan/dissectors/packet-rpc.c
+++ b/epan/dissectors/packet-rpc.c
@@ -3218,7 +3218,7 @@ dissect_rpc_fragment(tvbuff_t *tvb, int offset, packet_info *pinfo,
  *         (i.e., to the RPC record mark field).
  */
 
-int
+static int
 find_rpc_over_tcp_reply_start(tvbuff_t *tvb, int offset)
 {
 
@@ -3355,7 +3355,7 @@ int      i;
  *       if no valid RPC header is found.
  */
 
-int
+static int
 find_and_dissect_rpc_fragment(tvbuff_t *tvb, int offset, packet_info *pinfo,
                                                          proto_tree *tree, rec_dissector_t dissector,
                                                          gboolean is_heur,

diff --git a/file.c b/file.c
index 84c751eafc22222ccba073bf8e5b7aaae356c182..74c8978a478db00562aa878cef32b69bc44778f4 100644 (file)
--- a/file.c
+++ b/file.c
@@ -1476,7 +1476,7 @@ typedef enum {
   PSP_FAILED
 } psp_return_t;
 
-psp_return_t
+static psp_return_t
 process_specified_packets(capture_file *cf, packet_range_t *range,
     const char *string1, const char *string2,
     gboolean (*callback)(capture_file *, frame_data *,

diff --git a/fileset.c b/fileset.c
index 0a1191be8ea40f3de595e4559366a9b9b87c5d75..8e4397ea6f6cac64b8b86e23b11b56b3bbd72c6b 100644 (file)
--- a/fileset.c
+++ b/fileset.c
@@ -172,7 +172,7 @@ fileset_is_file_in_set(const char *fname1, const char *fname2)
 
 
 /* we know this file is part of the set, so add it */
-fileset_entry *
+static fileset_entry *
 fileset_add_file(const char *dirname, const char *fname, gboolean current)
 {
     int fh, result;
@@ -213,7 +213,7 @@ fileset_add_file(const char *dirname, const char *fname, gboolean current)
 
 
 /* compare two list entries by creation date/time */
-gint
+static gint
 fileset_compare_creation(gconstpointer a, gconstpointer b)
 {
     const fileset_entry *entry_a = a;
@@ -319,7 +319,7 @@ fileset_get_dirname(void)
 
 
 /* get the current list entry, or NULL */
-GList *
+static GList *
 fileset_get_current(void)
 {
     GList         *le;
@@ -383,7 +383,7 @@ fileset_get_previous(void)
 
 
 /* delete a single entry */
-void fileset_entry_delete(gpointer data, gpointer user_data _U_)
+static void fileset_entry_delete(gpointer data, gpointer user_data _U_)
 {
     fileset_entry *entry = data;
 

diff --git a/g711.c b/g711.c
index 7fddaed43a613b2119febae5d55b12048b1a52be..5ae74148ba150b7ad25cf044a7d39076115ab4df 100644 (file)
--- a/g711.c
+++ b/g711.c
@@ -26,6 +26,8 @@
  * Mountain View, California  94043
  */
 
+#include "g711.h"
+
 /*
  * g711.c
  *
@@ -265,21 +267,23 @@ ulaw2linear(
 }
 
 /* A-law to u-law conversion */
-unsigned char
-alaw2ulaw(
-       unsigned char   aval)
-{
-       aval &= 0xff;
-       return ((aval & 0x80) ? (0xFF ^ _a2u[aval ^ 0xD5]) :
-           (0x7F ^ _a2u[aval ^ 0x55]));
-}
+/* unsigned char
+ * alaw2ulaw(
+ *     unsigned char   aval)
+ * {
+ *     aval &= 0xff;
+ *     return ((aval & 0x80) ? (0xFF ^ _a2u[aval ^ 0xD5]) :
+ *         (0x7F ^ _a2u[aval ^ 0x55]));
+ * }
+ */
 
 /* u-law to A-law conversion */
-unsigned char
-ulaw2alaw(
-       unsigned char   uval)
-{
-       uval &= 0xff;
-       return ((uval & 0x80) ? (0xD5 ^ (_u2a[0xFF ^ uval] - 1)) :
-           (0x55 ^ (_u2a[0x7F ^ uval] - 1)));
-}
+/* unsigned char
+ * ulaw2alaw(
+ *     unsigned char   uval)
+ * {
+ *     uval &= 0xff;
+ *     return ((uval & 0x80) ? (0xD5 ^ (_u2a[0xFF ^ uval] - 1)) :
+ *         (0x55 ^ (_u2a[0x7F ^ uval] - 1)));
+ * }
+ */

diff --git a/gtk/menu.c b/gtk/menu.c
index 8920d0c3f569851a851c63cced97141abfa0ee6f..61179bbb1fa8ae5b5e0960d05346e36e334a0cc5 100644 (file)
--- a/gtk/menu.c
+++ b/gtk/menu.c
@@ -976,7 +976,7 @@ update_menu_recent_capture_file1(GtkWidget *widget, gpointer cnt) {
 
 
 /* update the menu */
-void
+static void
 update_menu_recent_capture_file(GtkWidget *submenu_recent_files) {
     guint cnt = 0;
 
@@ -989,7 +989,7 @@ update_menu_recent_capture_file(GtkWidget *submenu_recent_files) {
 
 
 /* remove the capture filename from the "Recent Files" menu */
-void
+static void
 remove_menu_recent_capture_file(GtkWidget *widget, gpointer unused _U_) {
     GtkWidget *submenu_recent_files;
     gchar *widget_cf_name;
@@ -1068,7 +1068,7 @@ static void menu_open_recent_file_answered_cb(gpointer dialog _U_, gint btn, gpo
     }
 }
 
-void
+static void
 menu_open_recent_file_cmd_cb(GtkWidget *widget, gpointer data _U_) {
   gpointer  dialog;
 
@@ -1086,7 +1086,7 @@ menu_open_recent_file_cmd_cb(GtkWidget *widget, gpointer data _U_) {
 }
 
 /* add the capture filename (with an absolute path) to the "Recent Files" menu */
-void
+static void
 add_menu_recent_capture_file_absolute(gchar *cf_name) {
        GtkWidget *submenu_recent_files;
        GList *menu_item_list;

diff --git a/packet-range.c b/packet-range.c
index b39c6fce8fa5c0ac30dc961106dd41ad05ff49a3..4c53c92f9fcd04b72075610b48822cbcea437348 100644 (file)
--- a/packet-range.c
+++ b/packet-range.c
@@ -41,7 +41,7 @@
 #include "packet-range.h"
 
 /* (re-)calculate the packet counts (except the user specified range) */
-void packet_range_calc(packet_range_t *range) {
+static void packet_range_calc(packet_range_t *range) {
   guint32       current_count;
   guint32       mark_low;
   guint32       mark_high;