diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-02-05 22:50:17 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-02-05 22:50:17 +0000 |
| commit | 2d3a60e9a94a76448f009c309fc95fa4c02d8529 (patch) | |
| tree | a9cbbe5b952cd94d5971761df2bc2163c7b9c3df /epan/ftypes/ftypes.c | |
| parent | e0828c513d59cb40a36133a2bf931b12ad31f9d5 (diff) | |
"log" is a name that belongs to the ANSI C89 standard; it refers to a
function that computes the natural logarithm of a double. Using it as
the name of a pointer to a routine to do logging can cause namespace
collisions; in fact, it *does* cause them on AIX. Rename the function
argument to "logfunc".
svn path=/trunk/; revision=4700
Diffstat (limited to 'epan/ftypes/ftypes.c')
| -rw-r--r-- | epan/ftypes/ftypes.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/epan/ftypes/ftypes.c b/epan/ftypes/ftypes.c index fab6d58a91..b4b502b5fc 100644 --- a/epan/ftypes/ftypes.c +++ b/epan/ftypes/ftypes.c @@ -1,10 +1,9 @@ /* - * $Id: ftypes.c,v 1.5 2001/10/26 17:29:12 gram Exp $ + * $Id: ftypes.c,v 1.6 2002/02/05 22:50:17 guy Exp $ * * Ethereal - Network traffic analyzer - * By Gerald Combs <gerald@zing.org> + * By Gerald Combs <gerald@ethereal.com> * Copyright 2001 Gerald Combs - * * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -238,18 +237,18 @@ fvalue_free(fvalue_t *fv) fvalue_t* -fvalue_from_string(ftenum_t ftype, char *s, LogFunc log) +fvalue_from_string(ftenum_t ftype, char *s, LogFunc logfunc) { fvalue_t *fv; fv = fvalue_new(ftype); if (fv->ftype->val_from_string) { - if (fv->ftype->val_from_string(fv, s, log)) { + if (fv->ftype->val_from_string(fv, s, logfunc)) { return fv; } } else { - log("\"%s\" cannot be converted to %s.", + logfunc("\"%s\" cannot be converted to %s.", s, ftype_pretty_name(ftype)); } fvalue_free(fv); |