aboutsummaryrefslogtreecommitdiffstats
path: root/packet-giop.c
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2003-11-26 02:58:12 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2003-11-26 02:58:12 +0000
commite1cbe4811903213d916ad01166d8b67e2f601450 (patch)
tree7b5a2ce4f2040de3af7c1e385a61559722cd3fcd /packet-giop.c
parentf877f55a39c565e2799e464b930ab6cd9b5957a4 (diff)
From Patrick Kursawe: rename "getline()" so it doesn't collide with the
"getline()" declared in <stdio.h> with recent versions of glibc. Fix a typo in the AUTHORS file. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@9094 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-giop.c')
-rw-r--r--packet-giop.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/packet-giop.c b/packet-giop.c
index 49de0bfdc4..4bee597d4d 100644
--- a/packet-giop.c
+++ b/packet-giop.c
@@ -9,7 +9,7 @@
* Frank Singleton <frank.singleton@ericsson.com>
* Trevor Shepherd <eustrsd@am1.ericsson.se>
*
- * $Id: packet-giop.c,v 1.73 2003/11/16 23:17:18 guy Exp $
+ * $Id: packet-giop.c,v 1.74 2003/11/26 02:58:12 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -1265,11 +1265,11 @@ static guint32 string_to_IOR(guchar *in, guint32 in_len, guint8 **out){
/*
- * Simple getline, copied from somewhere :)
+ * Simple "get a line" routine, copied from somewhere :)
*
*/
-static int getline(FILE *fp, gchar *line, int maxlen) {
+static int giop_getline(FILE *fp, gchar *line, int maxlen) {
if (fgets(line,maxlen,fp) == NULL)
return 0;
@@ -1305,7 +1305,7 @@ static void read_IOR_strings_from_file(gchar *name, int max_iorlen) {
buf = g_malloc0(max_iorlen+1); /* input buf */
- while ((len = getline(fp,buf,max_iorlen+1)) > 0) {
+ while ((len = giop_getline(fp,buf,max_iorlen+1)) > 0) {
my_offset = 0; /* reset for every IOR read */
ior_val_len = string_to_IOR(buf,len,&out); /* convert */