diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2004-05-27 13:18:51 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2004-05-27 13:18:51 (GMT) |
| commit | d63bdddac575b06d8dbaff5caf199f191258281a (patch) | |
| tree | 81621affdfd50f3451faa2c5568732111932e247 /generic/tclScan.c | |
| parent | 4761295d5dc11e76a759fc26de4b30d09bccd1a5 (diff) | |
| download | tcl-d63bdddac575b06d8dbaff5caf199f191258281a.zip tcl-d63bdddac575b06d8dbaff5caf199f191258281a.tar.gz tcl-d63bdddac575b06d8dbaff5caf199f191258281a.tar.bz2 | |
Made compiling with -Wstrict-prototypes -Wmissing-prototypes much cleaner.
Also added support for [FRQ 951168] but left that switched off by default.
Diffstat (limited to 'generic/tclScan.c')
| -rw-r--r-- | generic/tclScan.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/generic/tclScan.c b/generic/tclScan.c index 2ff616d..47d40bd 100644 --- a/generic/tclScan.c +++ b/generic/tclScan.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: tclScan.c,v 1.13 2004/04/06 22:25:54 dgp Exp $ + * RCS: @(#) $Id: tclScan.c,v 1.14 2004/05/27 13:18:53 dkf Exp $ */ #include "tclInt.h" @@ -575,9 +575,9 @@ Tcl_ScanObjCmd(dummy, interp, objc, objv) int base = 0; int underflow = 0; size_t width; - long (*fn)() = NULL; + long (*fn) _ANSI_ARGS_((char*,void*,int)) = NULL; #ifndef TCL_WIDE_INT_IS_LONG - Tcl_WideInt (*lfn)() = NULL; + Tcl_WideInt (*lfn) _ANSI_ARGS_((char*,void*,int)) = NULL; Tcl_WideInt wideValue; #endif Tcl_UniChar ch, sch; @@ -727,42 +727,42 @@ Tcl_ScanObjCmd(dummy, interp, objc, objv) case 'd': op = 'i'; base = 10; - fn = (long (*)())strtol; + fn = (long (*) _ANSI_ARGS_((char*,void*,int)))strtol; #ifndef TCL_WIDE_INT_IS_LONG - lfn = (Tcl_WideInt (*)())strtoll; + lfn = (Tcl_WideInt (*)_ANSI_ARGS_((char*,void*,int)))strtoll; #endif break; case 'i': op = 'i'; base = 0; - fn = (long (*)())strtol; + fn = (long (*)_ANSI_ARGS_((char*,void*,int)))strtol; #ifndef TCL_WIDE_INT_IS_LONG - lfn = (Tcl_WideInt (*)())strtoll; + lfn = (Tcl_WideInt (*)_ANSI_ARGS_((char*,void*,int)))strtoll; #endif break; case 'o': op = 'i'; base = 8; - fn = (long (*)())strtoul; + fn = (long (*)_ANSI_ARGS_((char*,void*,int)))strtoul; #ifndef TCL_WIDE_INT_IS_LONG - lfn = (Tcl_WideInt (*)())strtoull; + lfn = (Tcl_WideInt (*)_ANSI_ARGS_((char*,void*,int)))strtoull; #endif break; case 'x': op = 'i'; base = 16; - fn = (long (*)())strtoul; + fn = (long (*)_ANSI_ARGS_((char*,void*,int)))strtoul; #ifndef TCL_WIDE_INT_IS_LONG - lfn = (Tcl_WideInt (*)())strtoull; + lfn = (Tcl_WideInt (*)_ANSI_ARGS_((char*,void*,int)))strtoull; #endif break; case 'u': op = 'i'; base = 10; flags |= SCAN_UNSIGNED; - fn = (long (*)())strtoul; + fn = (long (*)_ANSI_ARGS_((char*,void*,int)))strtoul; #ifndef TCL_WIDE_INT_IS_LONG - lfn = (Tcl_WideInt (*)())strtoull; + lfn = (Tcl_WideInt (*)_ANSI_ARGS_((char*,void*,int)))strtoull; #endif break; |