osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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.

svn path=/trunk/; revision=9094
This commit is contained in:
Guy Harris 2003-11-26 02:58:12 +00:00
parent d792460eac
commit d525d957e4
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AUTHORS
View File

@ -23,7 +23,7 @@ Hannes R. Boehm <hannes[AT]boehm.org> {
OSPFv2
RIPv1, RIPv2
CDP (Cisco Discover Protocol Version 1)
CDP (Cisco Discovery Protocol Version 1)
}
Mike Hall <mike [AT] hallzone.net> {
@ -1958,6 +1958,7 @@ And assorted fixes and enhancements by the people listed above and by:
Martin Mathieson <martin [AT] arca-technologies.com>
Eric Wedel <ewedel [AT] bluearc.com>
Reinhard Speyerer <rspmn [AT] arcor.de>
Patrick Kursawe <phosphan [AT] gentoo.org>
Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to
give his permission to use his version of snprintf.c.

1
doc/ethereal.pod
View File

@ -2081,6 +2081,7 @@ B<http://www.ethereal.com>.
Martin Mathieson <martin [AT] arca-technologies.com>
Eric Wedel <ewedel [AT] bluearc.com>
Reinhard Speyerer <rspmn [AT] arcor.de>
Patrick Kursawe <phosphan [AT] gentoo.org>
Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his
permission to use his version of snprintf.c.

8
packet-giop.c
View File

@ -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 */