aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--AUTHORS5
-rw-r--r--asn1.c8
-rw-r--r--asn1.h4
-rw-r--r--doc/ethereal.pod.template1
-rw-r--r--gtk/prefs_dlg.c14
-rw-r--r--prefs-int.h6
-rw-r--r--prefs.c10
7 files changed, 27 insertions, 21 deletions
diff --git a/AUTHORS b/AUTHORS
index 9de8506924..0b7f1da3fc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1260,6 +1260,11 @@ Bill Fumerola <billf[AT]FreeBSD.org> {
Recognize "Option negotiated failed" error in TFTP
}
+Chris Waters <chris[AT]waters.co.nz> {
+ Don't use "bool" as a variable name or structure member, as it's
+ a C++ keyword
+}
+
Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to
give his permission to use his version of snprintf.c.
diff --git a/asn1.c b/asn1.c
index fbe7284f8f..e39bee2c91 100644
--- a/asn1.c
+++ b/asn1.c
@@ -1,7 +1,7 @@
/* asn1.c
* Routines for ASN.1 BER dissection
*
- * $Id: asn1.c,v 1.13 2002/05/13 01:24:45 guy Exp $
+ * $Id: asn1.c,v 1.14 2002/06/16 00:53:17 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -386,7 +386,7 @@ asn1_null_decode ( ASN1_SCK *asn1, int enc_len)
* (
* ASN1_SCK *asn1,
* int enc_len,
- * gboolean *bool
+ * gboolean *boolean
* )
* DESCRIPTION: Decodes Boolean.
* Parameters:
@@ -396,7 +396,7 @@ asn1_null_decode ( ASN1_SCK *asn1, int enc_len)
* RETURNS: ASN1_ERR value (ASN1_ERR_NOERROR on success)
*/
int
-asn1_bool_decode ( ASN1_SCK *asn1, int enc_len, gboolean *bool)
+asn1_bool_decode ( ASN1_SCK *asn1, int enc_len, gboolean *boolean)
{
int ret;
guchar ch;
@@ -406,7 +406,7 @@ asn1_bool_decode ( ASN1_SCK *asn1, int enc_len, gboolean *bool)
ret = asn1_octet_decode (asn1, &ch);
if (ret != ASN1_ERR_NOERROR)
return ret;
- *bool = ch ? TRUE : FALSE;
+ *boolean = ch ? TRUE : FALSE;
return ASN1_ERR_NOERROR;
}
diff --git a/asn1.h b/asn1.h
index f0bb4133fb..949611e4b6 100644
--- a/asn1.h
+++ b/asn1.h
@@ -1,7 +1,7 @@
/* asn1.h
* Definitions for ASN.1 BER dissection
*
- * $Id: asn1.h,v 1.7 2002/03/12 10:37:01 guy Exp $
+ * $Id: asn1.h,v 1.8 2002/06/16 00:53:17 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -122,7 +122,7 @@ int asn1_header_decode(ASN1_SCK *asn1, guint *cls, guint *con, guint *tag,
int asn1_eoc (ASN1_SCK *asn1, int eoc);
int asn1_eoc_decode (ASN1_SCK *asn1, int eoc);
int asn1_null_decode (ASN1_SCK *asn1, int enc_len);
-int asn1_bool_decode (ASN1_SCK *asn1, int enc_len, gboolean *bool);
+int asn1_bool_decode (ASN1_SCK *asn1, int enc_len, gboolean *boolean);
int asn1_int32_value_decode (ASN1_SCK *asn1, int enc_len, gint32 *integer);
int asn1_int32_decode (ASN1_SCK *asn1, gint32 *integer, guint *nbytes);
int asn1_uint32_value_decode (ASN1_SCK *asn1, int enc_len, guint *integer);
diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template
index fe4b7a8b71..3712993585 100644
--- a/doc/ethereal.pod.template
+++ b/doc/ethereal.pod.template
@@ -1450,6 +1450,7 @@ B<http://www.ethereal.com>.
Steve Housley <Steve_Housley[AT]eur.3com.com>
Peter Hawkins <peter[AT]hawkins.emu.id.au>
Bill Fumerola <billf[AT]FreeBSD.org>
+ Chris Waters <chris[AT]waters.co.nz>
Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his
permission to use his version of snprintf.c.
diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c
index 98b67ce3cd..0072229443 100644
--- a/gtk/prefs_dlg.c
+++ b/gtk/prefs_dlg.c
@@ -1,7 +1,7 @@
/* prefs_dlg.c
* Routines for handling preferences
*
- * $Id: prefs_dlg.c,v 1.46 2002/04/20 20:29:28 guy Exp $
+ * $Id: prefs_dlg.c,v 1.47 2002/06/16 00:53:20 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -165,10 +165,10 @@ pref_show(pref_t *pref, gpointer user_data)
break;
case PREF_BOOL:
- pref->saved_val.bool = *pref->varp.bool;
+ pref->saved_val.boolean = *pref->varp.boolean;
pref->control = create_preference_check_button(main_tb, pref->ordinal,
label_string, pref->description,
- pref->saved_val.bool);
+ pref->saved_val.boolean);
break;
case PREF_ENUM:
@@ -715,9 +715,9 @@ pref_fetch(pref_t *pref, gpointer user_data)
case PREF_BOOL:
bval = GTK_TOGGLE_BUTTON(pref->control)->active;
- if (*pref->varp.bool != bval) {
+ if (*pref->varp.boolean != bval) {
*pref_changed_p = TRUE;
- *pref->varp.bool = bval;
+ *pref->varp.boolean = bval;
}
break;
@@ -949,9 +949,9 @@ pref_revert(pref_t *pref, gpointer user_data)
break;
case PREF_BOOL:
- if (*pref->varp.bool != pref->saved_val.bool) {
+ if (*pref->varp.boolean != pref->saved_val.boolean) {
*pref_changed_p = TRUE;
- *pref->varp.bool = pref->saved_val.bool;
+ *pref->varp.boolean = pref->saved_val.boolean;
}
break;
diff --git a/prefs-int.h b/prefs-int.h
index b5227c4f4c..390895d08c 100644
--- a/prefs-int.h
+++ b/prefs-int.h
@@ -2,7 +2,7 @@
* Definitions for implementation of preference handling routines;
* used by "friends" of the preferences type.
*
- * $Id: prefs-int.h,v 1.6 2002/05/25 01:47:46 guy Exp $
+ * $Id: prefs-int.h,v 1.7 2002/06/16 00:53:17 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -57,13 +57,13 @@ struct preference {
pref_type_t type; /* type of that preference */
union {
guint *uint;
- gboolean *bool;
+ gboolean *boolean;
gint *enump;
char **string;
} varp; /* pointer to variable storing the value */
union {
guint uint;
- gboolean bool;
+ gboolean boolean;
gint enumval;
char *string;
} saved_val; /* original value, when editing from the GUI */
diff --git a/prefs.c b/prefs.c
index 5fe51c5691..2b7323ff77 100644
--- a/prefs.c
+++ b/prefs.c
@@ -1,7 +1,7 @@
/* prefs.c
* Routines for handling preferences
*
- * $Id: prefs.c,v 1.84 2002/05/29 07:35:55 guy Exp $
+ * $Id: prefs.c,v 1.85 2002/06/16 00:53:17 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -387,7 +387,7 @@ prefs_register_bool_preference(module_t *module, const char *name,
preference = register_preference(module, name, title, description);
preference->type = PREF_BOOL;
- preference->varp.bool = var;
+ preference->varp.boolean = var;
}
/*
@@ -1524,9 +1524,9 @@ set_pref(gchar *pref_name, gchar *value)
bval = TRUE;
else
bval = FALSE;
- if (*pref->varp.bool != bval) {
+ if (*pref->varp.boolean != bval) {
module->prefs_changed = TRUE;
- *pref->varp.bool = bval;
+ *pref->varp.boolean = bval;
}
break;
@@ -1613,7 +1613,7 @@ write_pref(gpointer data, gpointer user_data)
case PREF_BOOL:
fprintf(arg->pf, "# TRUE or FALSE (case-insensitive).\n");
fprintf(arg->pf, "%s.%s: %s\n", arg->module->name, pref->name,
- *pref->varp.bool ? "TRUE" : "FALSE");
+ *pref->varp.boolean ? "TRUE" : "FALSE");
break;
case PREF_ENUM:
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 23:40:04 +0000