summaryrefslogtreecommitdiffstats
path: root/compat
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2008-04-27 22:21:26 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2008-04-27 22:21:26 (GMT)
commit26c09b8c918f8223a38fc764aa9a39fb8ce45991 (patch)
tree4e7b1367d8eb030241db8325caa541ce387b7313 /compat
parent60e86b2a4795ded3f41e7361470071827477f5b0 (diff)
downloadtcl-26c09b8c918f8223a38fc764aa9a39fb8ce45991.zip
tcl-26c09b8c918f8223a38fc764aa9a39fb8ce45991.tar.gz
tcl-26c09b8c918f8223a38fc764aa9a39fb8ce45991.tar.bz2
Get rid of pre-C89-isms (esp. CONST vs const).
Diffstat (limited to 'compat')
-rw-r--r--compat/memcmp.c12
-rw-r--r--compat/strncasecmp.c14
-rw-r--r--compat/strtod.c8
-rw-r--r--compat/strtol.c6
-rw-r--r--compat/strtoul.c6
5 files changed, 23 insertions, 23 deletions
diff --git a/compat/memcmp.c b/compat/memcmp.c
index 43202a5..a0666f3 100644
--- a/compat/memcmp.c
+++ b/compat/memcmp.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: memcmp.c,v 1.4 2007/01/22 09:15:50 dkf Exp $
+ * RCS: @(#) $Id: memcmp.c,v 1.5 2008/04/27 22:21:27 dkf Exp $
*/
#include "tclPort.h"
@@ -17,7 +17,7 @@
* Here is the prototype just in case it is not included in tclPort.h.
*/
-int memcmp(CONST VOID *s1, CONST VOID *s2, size_t n);
+int memcmp(const void *s1, const void *s2, size_t n);
/*
*----------------------------------------------------------------------
@@ -40,12 +40,12 @@ int memcmp(CONST VOID *s1, CONST VOID *s2, size_t n);
int
memcmp(
- CONST VOID *s1, /* First string. */
- CONST VOID *s2, /* Second string. */
+ const void *s1, /* First string. */
+ const void *s2, /* Second string. */
size_t n) /* Length to compare. */
{
- CONST unsigned char *ptr1 = (CONST unsigned char *) s1;
- CONST unsigned char *ptr2 = (CONST unsigned char *) s2;
+ const unsigned char *ptr1 = (const unsigned char *) s1;
+ const unsigned char *ptr2 = (const unsigned char *) s2;
for ( ; n-- ; ptr1++, ptr2++) {
unsigned char u1 = *ptr1, u2 = *ptr2;
diff --git a/compat/strncasecmp.c b/compat/strncasecmp.c
index d752ba8..f944aaa 100644
--- a/compat/strncasecmp.c
+++ b/compat/strncasecmp.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: strncasecmp.c,v 1.3 2007/04/16 13:36:34 dkf Exp $
+ * RCS: @(#) $Id: strncasecmp.c,v 1.4 2008/04/27 22:21:28 dkf Exp $
*/
#include "tclPort.h"
@@ -59,8 +59,8 @@ static unsigned char charmap[] = {
* Here are the prototypes just in case they are not included in tclPort.h.
*/
-int strncasecmp(CONST char *s1, CONST char *s2, size_t n);
-int strcasecmp(CONST char *s1, CONST char *s2);
+int strncasecmp(const char *s1, const char *s2, size_t n);
+int strcasecmp(const char *s1, const char *s2);
/*
*----------------------------------------------------------------------
@@ -81,8 +81,8 @@ int strcasecmp(CONST char *s1, CONST char *s2);
int
strcasecmp(
- CONST char *s1, /* First string. */
- CONST char *s2) /* Second string. */
+ const char *s1, /* First string. */
+ const char *s2) /* Second string. */
{
unsigned char u1, u2;
@@ -116,8 +116,8 @@ strcasecmp(
int
strncasecmp(
- CONST char *s1, /* First string. */
- CONST char *s2, /* Second string. */
+ const char *s1, /* First string. */
+ const char *s2, /* Second string. */
size_t length) /* Maximum number of characters to compare
* (stop earlier if the end of either string
* is reached). */
diff --git a/compat/strtod.c b/compat/strtod.c
index 9e494b1..aa73ab0 100644
--- a/compat/strtod.c
+++ b/compat/strtod.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: strtod.c,v 1.8 2007/04/16 13:36:34 dkf Exp $
+ * RCS: @(#) $Id: strtod.c,v 1.9 2008/04/27 22:21:28 dkf Exp $
*/
#include "tclInt.h"
@@ -63,7 +63,7 @@ static double powersOf10[] = { /* Table giving binary powers of 10. Entry */
double
strtod(
- CONST char *string, /* A decimal ASCII floating-point number,
+ const char *string, /* A decimal ASCII floating-point number,
* optionally preceded by white space. Must
* have form "-I.FE-X", where I is the integer
* part of the mantissa, F is the fractional
@@ -79,7 +79,7 @@ strtod(
{
int sign, expSign = FALSE;
double fraction, dblExp, *d;
- register CONST char *p;
+ register const char *p;
register int c;
int exp = 0; /* Exponent read from "EX" field. */
int fracExp = 0; /* Exponent that derives from the fractional
@@ -94,7 +94,7 @@ strtod(
int mantSize; /* Number of digits in mantissa. */
int decPt; /* Number of mantissa digits BEFORE decimal
* point. */
- CONST char *pExp; /* Temporarily holds location of exponent in
+ const char *pExp; /* Temporarily holds location of exponent in
* string. */
/*
diff --git a/compat/strtol.c b/compat/strtol.c
index 3779597..85c2520 100644
--- a/compat/strtol.c
+++ b/compat/strtol.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: strtol.c,v 1.6 2007/04/16 13:36:34 dkf Exp $
+ * RCS: @(#) $Id: strtol.c,v 1.7 2008/04/27 22:21:28 dkf Exp $
*/
#include <ctype.h>
@@ -36,7 +36,7 @@
long int
strtol(
- CONST char *string, /* String of ASCII digits, possibly preceded
+ const char *string, /* String of ASCII digits, possibly preceded
* by white space. For bases greater than 10,
* either lower- or upper-case digits may be
* used. */
@@ -48,7 +48,7 @@ strtol(
* hex, "0" means octal, anything else means
* decimal. */
{
- register CONST char *p;
+ register const char *p;
long result;
/*
diff --git a/compat/strtoul.c b/compat/strtoul.c
index 64f95a6..21ee445 100644
--- a/compat/strtoul.c
+++ b/compat/strtoul.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: strtoul.c,v 1.7 2007/04/16 13:36:34 dkf Exp $
+ * RCS: @(#) $Id: strtoul.c,v 1.8 2008/04/27 22:21:28 dkf Exp $
*/
#include "tclInt.h"
@@ -52,7 +52,7 @@ static char cvtIn[] = {
unsigned long int
strtoul(
- CONST char *string, /* String of ASCII digits, possibly preceded
+ const char *string, /* String of ASCII digits, possibly preceded
* by white space. For bases greater than 10,
* either lower- or upper-case digits may be
* used. */
@@ -64,7 +64,7 @@ strtoul(
* hex, "0" means octal, anything else means
* decimal. */
{
- register CONST char *p;
+ register const char *p;
register unsigned long int result = 0;
register unsigned digit;
int anyDigits = 0;