aboutsummaryrefslogtreecommitdiffstats
path: root/asn1.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2002-06-16 00:53:20 +0000
committerGuy Harris <guy@alum.mit.edu>2002-06-16 00:53:20 +0000
commit3a407d9567a2443401eef9445cb1e228dd02008b (patch)
treede35242e1888899aa25b343c56bc89a5616a7eca /asn1.c
parent561aaa66e05e2eff2ccd4cb38488b1023aa032c6 (diff)
From Chris Waters: don't use "bool" as a variable name or structure
member, as it's a C++ keyword. svn path=/trunk/; revision=5677
Diffstat (limited to 'asn1.c')
-rw-r--r--asn1.c8
1 files changed, 4 insertions, 4 deletions
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;
}