aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2005-08-02 04:34:35 +0000
committerJörg Mayer <jmayer@loplof.de>2005-08-02 04:34:35 +0000
commitefdd4601ce903f9f2a185b627d67dc2d4cdd26c3 (patch)
tree385faf4ceadb47ec859ece4217be8368219067fe /epan
parent37a3b7529fc48686a851320b08c87653e6af8306 (diff)
Fix more "no previous declaration" warnings
svn path=/trunk/; revision=15171
Diffstat (limited to 'epan')
-rw-r--r--epan/base64.c1
-rw-r--r--epan/conversation.c2
-rw-r--r--epan/packet.c2
-rw-r--r--epan/prefs.c2
-rw-r--r--epan/radius_dict.l12
-rw-r--r--epan/sha1.c2
6 files changed, 11 insertions, 10 deletions
diff --git a/epan/base64.c b/epan/base64.c
index 48456e3728..2d7f034871 100644
--- a/epan/base64.c
+++ b/epan/base64.c
@@ -27,6 +27,7 @@
#endif
#include <string.h>
+#include "base64.h"
/* Decode a base64 string in-place - simple and slow algorithm.
Return length of result. Taken from rproxy/librsync/base64.c by
diff --git a/epan/conversation.c b/epan/conversation.c
index d597a0f8c4..70529ae636 100644
--- a/epan/conversation.c
+++ b/epan/conversation.c
@@ -101,7 +101,7 @@ static GMemChunk *conv_proto_data_area = NULL;
* addr2 and port2 are used in the function if their respective conversation
* options bits are set (NO_ADDR2 and NO_PORT2).
*/
-conversation_t *
+static conversation_t *
conversation_create_from_template(conversation_t *conversation, address *addr2, guint32 port2)
{
/*
diff --git a/epan/packet.c b/epan/packet.c
index bb33f54b88..ca7b44410c 100644
--- a/epan/packet.c
+++ b/epan/packet.c
@@ -1225,7 +1225,7 @@ dissector_all_tables_foreach_func (gpointer key, gpointer value, gpointer user_d
* Walk all dissector tables calling a user supplied function on each
* entry.
*/
-void
+static void
dissector_all_tables_foreach (DATFunc func,
gpointer user_data)
{
diff --git a/epan/prefs.c b/epan/prefs.c
index 38ba2a9d79..4d257460be 100644
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -901,7 +901,7 @@ print.file: /a/very/long/path/
* They may be overridden by the global preferences file or the
* user's preferences file.
*/
-void
+static void
init_prefs(void) {
int i;
fmt_data *cfmt;
diff --git a/epan/radius_dict.l b/epan/radius_dict.l
index b3a575b311..4ced501ff7 100644
--- a/epan/radius_dict.l
+++ b/epan/radius_dict.l
@@ -232,7 +232,7 @@ void add_value(gchar* attrib_name, gchar* value_repr, long value) {
}
-void setup_attrs(gpointer k _U_, gpointer v, gpointer p _U_) {
+static void setup_attrs(gpointer k _U_, gpointer v, gpointer p _U_) {
radius_attr_info_t* a = v;
gpointer key;
@@ -249,19 +249,19 @@ void setup_attrs(gpointer k _U_, gpointer v, gpointer p _U_) {
}
}
-void setup_vendors(gpointer k _U_, gpointer v, gpointer p) {
+static void setup_vendors(gpointer k _U_, gpointer v, gpointer p) {
radius_vendor_info_t* vnd = v;
g_hash_table_foreach(vnd->attrs_by_id,setup_attrs,p);
}
-gboolean destroy_values(gpointer k, gpointer v, gpointer p _U_) {
+static gboolean destroy_values(gpointer k, gpointer v, gpointer p _U_) {
g_free(k);
g_array_free(v,FALSE);
return TRUE;
}
-gboolean destroy_attrs(gpointer k _U_, gpointer v, gpointer p _U_) {
+static gboolean destroy_attrs(gpointer k _U_, gpointer v, gpointer p _U_) {
radius_attr_info_t* a = v;
int i;
@@ -276,7 +276,7 @@ gboolean destroy_attrs(gpointer k _U_, gpointer v, gpointer p _U_) {
return TRUE;
}
-gboolean destroy_vendors(gpointer k _U_, gpointer v, gpointer p) {
+static gboolean destroy_vendors(gpointer k _U_, gpointer v, gpointer p) {
radius_vendor_info_t* vnd = v;
g_free(vnd->name);
g_hash_table_foreach_remove(vnd->attrs_by_id,destroy_attrs,p);
@@ -285,7 +285,7 @@ gboolean destroy_vendors(gpointer k _U_, gpointer v, gpointer p) {
return TRUE;
}
-void destroy_dict(radius_dictionary_t* d) {
+static void destroy_dict(radius_dictionary_t* d) {
g_hash_table_foreach_remove(d->attrs_by_id,destroy_attrs,NULL);
g_hash_table_foreach_remove(d->vendors_by_id,destroy_vendors,NULL);
g_hash_table_destroy(d->vendors_by_id);
diff --git a/epan/sha1.c b/epan/sha1.c
index bd06b0278c..606731d257 100644
--- a/epan/sha1.c
+++ b/epan/sha1.c
@@ -57,7 +57,7 @@ void sha1_starts( sha1_context *ctx )
ctx->state[4] = 0xC3D2E1F0;
}
-void sha1_process( sha1_context *ctx, guint8 data[64] )
+static void sha1_process( sha1_context *ctx, guint8 data[64] )
{
guint32 temp, W[16], A, B, C, D, E;