From 8adff5922376676c2eeb49de1cbab86cc345b887 Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Sat, 19 Mar 2005 18:43:48 +0000 Subject: Remove INT, LONG, BOOLEAN, STATIC, CONST, CHAR datatypes. use stdbool.h / inttypes.h if available. --- src/tool/tool.c | 20 ++++++++++---------- src/tool/tool.h | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'src/tool') diff --git a/src/tool/tool.c b/src/tool/tool.c index 2792c7ed..a8390692 100644 --- a/src/tool/tool.c +++ b/src/tool/tool.c @@ -14,7 +14,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: tool.c,v 1.2 2005/01/25 16:16:48 alex Exp $"; +static char UNUSED id[] = "$Id: tool.c,v 1.3 2005/03/19 18:43:52 fw Exp $"; #include "imp.h" #include @@ -26,14 +26,14 @@ static char UNUSED id[] = "$Id: tool.c,v 1.2 2005/01/25 16:16:48 alex Exp $"; #include "tool.h" -GLOBAL VOID -ngt_TrimStr( CHAR *String ) +GLOBAL void +ngt_TrimStr( char *String ) { /* Mit ngt_TrimStr() werden fuehrende und folgende Leerzeichen, * Tabulatoren und Zeilenumbrueche (ASCII 10 und ASCII 13) aus * dem String entfernt. */ - CHAR *start, *ptr; + char *start, *ptr; assert( String != NULL ); @@ -51,14 +51,14 @@ ngt_TrimStr( CHAR *String ) } /* ngt_TrimStr */ -GLOBAL CHAR * -ngt_LowerStr( CHAR *String ) +GLOBAL char * +ngt_LowerStr( char *String ) { /* String in Kleinbuchstaben konvertieren. Der uebergebene * Speicherbereich wird durch das Ergebnis ersetzt, zusaetzlich * wird dieser auch als Pointer geliefert. */ - CHAR *ptr; + char *ptr; assert( String != NULL ); @@ -74,13 +74,13 @@ ngt_LowerStr( CHAR *String ) } /* ngt_LowerStr */ -GLOBAL VOID -ngt_TrimLastChr( CHAR *String, CONST CHAR Chr) +GLOBAL void +ngt_TrimLastChr( char *String, const char Chr) { /* If last character in the string matches Chr, remove it. * Empty strings are handled correctly. */ - UINT len; + unsigned int len; assert( String != NULL ); diff --git a/src/tool/tool.h b/src/tool/tool.h index 13d4a9fc..5b386e59 100644 --- a/src/tool/tool.h +++ b/src/tool/tool.h @@ -8,7 +8,7 @@ * (at your option) any later version. * Please read the file COPYING, README and AUTHORS for more information. * - * $Id: tool.h,v 1.2 2005/02/04 13:09:03 alex Exp $ + * $Id: tool.h,v 1.3 2005/03/19 18:43:53 fw Exp $ * * Tool functions (Header) */ @@ -18,11 +18,11 @@ #define __tool_h__ -GLOBAL VOID ngt_TrimLastChr PARAMS((CHAR *String, CONST CHAR Chr )); +GLOBAL void ngt_TrimLastChr PARAMS((char *String, const char Chr )); -GLOBAL VOID ngt_TrimStr PARAMS((CHAR *String )); +GLOBAL void ngt_TrimStr PARAMS((char *String )); -GLOBAL CHAR *ngt_LowerStr PARAMS((CHAR *String )); +GLOBAL char *ngt_LowerStr PARAMS((char *String )); #endif -- cgit 1.4.1