diff options
Diffstat (limited to 'soltools')
57 files changed, 249 insertions, 297 deletions
diff --git a/soltools/adjustvisibility/adjustvisibility.cxx b/soltools/adjustvisibility/adjustvisibility.cxx index e67017018b1a..9e06e8347fd9 100644 --- a/soltools/adjustvisibility/adjustvisibility.cxx +++ b/soltools/adjustvisibility/adjustvisibility.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -241,11 +242,12 @@ void processObject(const std::string& rFile, bool bPreserve, bool bVerbose) if ( bPreserve ) { if ( fstat(fd, &aStatBuf) == -1) { - std::string sMessage("adjustVisibilty() failed: can't stat file "); - sMessage += rFile; - sMessage += ": "; - sMessage += std::strerror(errno); - throw std::runtime_error(sMessage); + close(fd); + std::string sMessage("adjustVisibilty() failed: can't stat file "); + sMessage += rFile; + sMessage += ": "; + sMessage += std::strerror(errno); + throw std::runtime_error(sMessage); } } @@ -309,3 +311,5 @@ int main(int argc, char* argv[]) return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/checkdll/checkdll.c b/soltools/checkdll/checkdll.c index 7c5473fb2510..a300e0b69d67 100644 --- a/soltools/checkdll/checkdll.c +++ b/soltools/checkdll/checkdll.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,7 +51,6 @@ void usage() int main(int argc, char *argv[]) { - int rc; int silent=0; void *phandle; char *(*pfun)(void); @@ -65,7 +65,7 @@ int main(int argc, char *argv[]) ++argv, --argc; } - if ( (rc = access( argv[1], R_OK )) == -1 ) { + if ( access( argv[1], R_OK ) == -1 ) { fprintf(stderr, "%s: ERROR: %s: %s\n", pprog_name, argv[1], strerror(errno)); return 2; @@ -95,3 +95,4 @@ int main(int argc, char *argv[]) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/checkdll/makefile.mk b/soltools/checkdll/makefile.mk index fc09a566005e..865d5a8ee008 100644 --- a/soltools/checkdll/makefile.mk +++ b/soltools/checkdll/makefile.mk @@ -45,7 +45,8 @@ LIBSALCPPRT=$(0) APP1TARGET = checkdll APP1OBJS = $(OBJ)$/checkdll.obj DEPOBJFILES = $(APP1OBJS) -.IF "$(OS)"!="FREEBSD" && "$(OS)"!="MACOSX" && "$(OS)"!="NETBSD" +.IF "$(OS)"!="FREEBSD" && "$(OS)"!="MACOSX" && "$(OS)"!="NETBSD" \ + && "$(OS)"!="OPENBSD" && "$(OS)"!="DRAGONFLY" STDLIB += -ldl .ENDIF .IF "$(OS)"=="NETBSD" diff --git a/soltools/cpp/_cpp.c b/soltools/cpp/_cpp.c index 134bf0075cf2..c1a2d7f81b40 100644 --- a/soltools/cpp/_cpp.c +++ b/soltools/cpp/_cpp.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -298,7 +299,7 @@ void } void * - domalloc(int size) + domalloc(size_t size) { void *p = malloc(size); @@ -381,3 +382,5 @@ void nerrs = 1; fflush(stderr); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/cpp/_eval.c b/soltools/cpp/_eval.c index a652e488d78f..c33ef690d1c9 100644 --- a/soltools/cpp/_eval.c +++ b/soltools/cpp/_eval.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #include <stdlib.h> #include <string.h> #include "cpp.h" @@ -233,7 +234,8 @@ long { Token *tp; Nlist *np; - int ntok, rnd; + size_t ntok; + int rnd; trp->tp++; if (kw == KIFDEF || kw == KIFNDEF) @@ -764,3 +766,5 @@ int i = -1; return i; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/cpp/_getopt.c b/soltools/cpp/_getopt.c index 589638936efb..65c5d5179a20 100644 --- a/soltools/cpp/_getopt.c +++ b/soltools/cpp/_getopt.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #include <stdio.h> #include <string.h> @@ -69,3 +70,5 @@ int } return c; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/cpp/_include.c b/soltools/cpp/_include.c index da2bf03c8ff4..5daa02a4ffbb 100644 --- a/soltools/cpp/_include.c +++ b/soltools/cpp/_include.c @@ -1,4 +1,5 @@ -#if (defined(_WIN32) || defined(_MSDOS) || defined(__IBMC__)) +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +#if (defined(_WIN32) || defined(__IBMC__)) # include <io.h> #else # include <unistd.h> @@ -12,10 +13,6 @@ #include <string.h> #include <fcntl.h> - -#ifdef __hpux -# define _HPUX_SOURCE -#endif #if defined(__IBMC__) || defined(__EMX__) # include <fcntl.h> # define PATH_MAX _MAX_PATH @@ -233,3 +230,4 @@ void } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/cpp/_lex.c b/soltools/cpp/_lex.c index 2ff188ff2264..7e7bf2e80721 100644 --- a/soltools/cpp/_lex.c +++ b/soltools/cpp/_lex.c @@ -1,7 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #include <stdio.h> #include <stdlib.h> #include <string.h> -#if (defined(_WIN32) || defined(_MSDOS) || defined(__IBMC__)) +#if (defined(_WIN32) || defined(__IBMC__)) #include <io.h> #else #include <unistd.h> @@ -634,7 +635,7 @@ Source * setsource(char *name, int path, int fd, char *str, int wrap) { Source *s = new(Source); - int len; + size_t len; s->line = 1; s->lineinc = 0; @@ -686,3 +687,5 @@ void cursource = s->next; dofree(s); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/cpp/_macro.c b/soltools/cpp/_macro.c index fe7d22f82373..294606524864 100644 --- a/soltools/cpp/_macro.c +++ b/soltools/cpp/_macro.c @@ -1,12 +1,10 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #ifdef _MSC_VER # define _POSIX_ #endif #include <stdio.h> #include <stdlib.h> #include <string.h> -#ifdef __hpux -# define _HPUX_SOURCE -#endif #if defined(__IBMC__) || defined(__EMX__) # define PATH_MAX _MAX_PATH #endif @@ -45,14 +43,13 @@ void args = NULL; if (tp < trp->lp && tp->type == LP && tp->wslen == 0) { - /* macro with args */ - int narg = 0; - tp += 1; args = new(Tokenrow); maketokenrow(2, args); if (tp->type != RP) { + /* macro with args */ + size_t narg = 0; int err = 0; for (;;) @@ -292,9 +289,8 @@ void void expand(Tokenrow * trp, Nlist * np, MacroValidatorList * pValidators) { -// Token * pOldNextTp; Tokenrow ntr; - int ntokc, narg, i; + int ntokc, narg; Tokenrow *atr[NARG + 1]; if (Mflag == 2) @@ -310,6 +306,8 @@ void ntokc = 1; else { + int i; + ntokc = gatherargs(trp, atr, &narg); if (narg < 0) { /* not actually a call (no '(') */ @@ -341,32 +339,12 @@ void } } -/* old - np->flag |= ISACTIVE; -*/ - -/* rh -*/ doconcat(&ntr); /* execute ## operators */ ntr.tp = ntr.bp; makespace(&ntr, trp->tp); -/* old -// expandrow(&ntr, "<expand>"); -// insertrow(trp, ntokc, &ntr); -// dofree(ntr.bp); -// np->flag &= ~ISACTIVE; -*/ - -/* NP - // Replace macro by its value: -*/ -// pOldNextTp = trp->tp+ntokc; tokenrow_zeroTokenIdentifiers(&ntr); insertrow(trp, ntokc, &ntr); - /* Reassign old macro validators: - */ -// mvl_move(pValidators, trp->tp - pOldNextTp); /* add validator for just invalidated macro: */ @@ -514,7 +492,7 @@ void error(ERROR, "# not followed by macro parameter"); continue; } - ntok = 1 + (rtr->tp - tp); + ntok = 1 + (int)(rtr->tp - tp); rtr->tp = tp; insertrow(rtr, ntok, stringify(atr[argno])); continue; @@ -552,7 +530,7 @@ void { Token *ltp, *ntp; Tokenrow ntr; - int len; + size_t len; for (trp->tp = trp->bp; trp->tp < trp->lp; trp->tp++) { @@ -615,7 +593,7 @@ void doconcat(&ntr); trp->tp = ltp; makespace(&ntr, ltp); - insertrow(trp, ntp - ltp, &ntr); + insertrow(trp, (int)(ntp - ltp), &ntr); dofree(ntr.bp); trp->tp--; } @@ -637,7 +615,7 @@ int for (ap = mac->ap->bp; ap < mac->ap->lp; ap++) { if (ap->len == tp->len && strncmp((char *) ap->t, (char *) tp->t, ap->len) == 0) - return ap - mac->ap->bp; + return (int)(ap - mac->ap->bp); } return -1; } @@ -754,3 +732,4 @@ void outptr = op; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/cpp/_mcrvalid.c b/soltools/cpp/_mcrvalid.c index 75813837d470..446f86d316d1 100644 --- a/soltools/cpp/_mcrvalid.c +++ b/soltools/cpp/_mcrvalid.c @@ -1,16 +1,10 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #include <stdio.h> #include <stdlib.h> #include <string.h> #include "cpp.h" -/* - Nlist * pMacro; - Token * pTokenWhereMacroBecomesValid; - struct macroValidator * - pNext; -*/ - void mvl_init(MacroValidatorList * out_pValidators) { @@ -69,21 +63,6 @@ mvl_add( MacroValidatorList * inout_pValidators, inout_pValidators->pFirst = pNew; } -/* -void -mvl_move( MacroValidatorList * inout_pValidators, - int in_nSpace ) -{ - MacroValidator * pV; - for ( pV = inout_pValidators->pFirst; - pV != 0; - pV = pV->pNext ) - { - pV->pTokenWhereMacroBecomesValid += in_nSpace; - } -} -*/ - void mvl_check( MacroValidatorList * inout_pValidators, Token * inout_pTokenToCheck) @@ -127,3 +106,4 @@ tokenrow_zeroTokenIdentifiers(Tokenrow* trp) } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/cpp/_nlist.c b/soltools/cpp/_nlist.c index a71085bfbbf9..9446b928ca87 100644 --- a/soltools/cpp/_nlist.c +++ b/soltools/cpp/_nlist.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -115,3 +116,5 @@ Nlist * } return NULL; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/cpp/_tokens.c b/soltools/cpp/_tokens.c index 863de2fbef02..03a4d44d9c08 100644 --- a/soltools/cpp/_tokens.c +++ b/soltools/cpp/_tokens.c @@ -1,8 +1,9 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #include <stdio.h> #include <stdlib.h> #include <string.h> #include <ctype.h> -#if (defined(_WIN32) || defined(_MSDOS) || defined(__IBMC__)) +#if (defined(_WIN32) || defined(__IBMC__)) #include <io.h> #else #include <unistd.h> @@ -193,8 +194,8 @@ void Token * growtokenrow(Tokenrow * trp) { - int ncur = trp->tp - trp->bp; - int nlast = trp->lp - trp->bp; + size_t ncur = trp->tp - trp->bp; + size_t nlast = trp->lp - trp->bp; trp->max = 3 * trp->max / 2 + 1; trp->bp = (Token *) realloc(trp->bp, trp->max * sizeof(Token)); @@ -234,7 +235,7 @@ int void insertrow(Tokenrow * dtr, int ntok, Tokenrow * str) { - int nrtok = rowlen(str); + int nrtok = (int)rowlen(str); dtr->tp += ntok; adjustrow(dtr, nrtok - ntok); @@ -273,9 +274,8 @@ void void movetokenrow(Tokenrow * dtr, Tokenrow * str) { - int nby; + size_t nby; - /* nby = sizeof(Token) * (str->lp - str->bp); */ nby = (char *) str->lp - (char *) str->bp; memmove(dtr->tp, str->bp, nby); } @@ -289,14 +289,13 @@ void void adjustrow(Tokenrow * trp, int nt) { - int nby, size; + size_t nby, size; if (nt == 0) return; size = (trp->lp - trp->bp) + nt; while (size > trp->max) growtokenrow(trp); - /* nby = sizeof(Token) * (trp->lp - trp->tp); */ nby = (char *) trp->lp - (char *) trp->tp; if (nby) memmove(trp->tp + nt, trp->tp, nby); @@ -310,7 +309,7 @@ void Tokenrow * copytokenrow(Tokenrow * dtr, Tokenrow * str) { - int len = rowlen(str); + int len = (int)rowlen(str); maketokenrow(len, dtr); movetokenrow(dtr, str); @@ -330,7 +329,7 @@ Tokenrow * Tokenrow *ntrp = new(Tokenrow); int len; - len = trp->lp - trp->tp; + len = (int)(trp->lp - trp->tp); if (len <= 0) len = 1; maketokenrow(len, ntrp); @@ -395,7 +394,7 @@ void { if (tp->type != NL) { - len = tp->len + tp->wslen; + len = (int)(tp->len + tp->wslen); p = tp->t - tp->wslen; /* add parameter check to delete operator? */ @@ -409,7 +408,7 @@ void if( ntp->type == NAME ) { uchar* np = ntp->t - ntp->wslen; - int nlen = ntp->len + ntp->wslen; + int nlen = (int)(ntp->len + ntp->wslen); memcpy(wbp, "if(", 3 ); wbp += 4; @@ -491,7 +490,7 @@ void { if (wbp > wbuf) { - if ( write(1, wbuf, wbp - wbuf) != -1) + if ( write(1, wbuf, (int)(wbp - wbuf)) != -1) wbp = wbuf; else exit(1); @@ -526,10 +525,12 @@ char * * Null terminated. */ uchar * - newstring(uchar * s, int l, int o) + newstring(uchar * s, size_t l, size_t o) { uchar *ns = (uchar *) domalloc(l + o + 1); ns[l + o] = '\0'; return (uchar *) strncpy((char *) ns + o, (char *) s, l) - o; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/cpp/_unix.c b/soltools/cpp/_unix.c index 5352f6f1f5f9..05eb375e2e7a 100644 --- a/soltools/cpp/_unix.c +++ b/soltools/cpp/_unix.c @@ -1,10 +1,11 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #include <stdio.h> #include <stddef.h> #include <stdlib.h> #include <string.h> #include <ctype.h> #include <fcntl.h> -#if (defined(_WIN32) || defined(_MSDOS) || defined(__IBMC__)) +#if (defined(_WIN32) || defined(__IBMC__)) #include <io.h> #else #include <unistd.h> @@ -12,7 +13,7 @@ #include "cpp.h" -#if defined MACOSX || !defined HAVE_GETOPT +#if defined MACOSX || defined AIX || !defined HAVE_GETOPT extern int stgetopt(int, char *const *, const char *); extern char *optarg; extern int optind; @@ -42,7 +43,7 @@ void Tokenrow tr; setup_kwtab(); -#if defined MACOSX || !defined HAVE_GETOPT +#if defined MACOSX || defined(AIX) || !defined HAVE_GETOPT while ((c = stgetopt(argc, argv, "NOPV:I:D:U:F:A:X:u:l:+")) != -1) #else while ((c = getopt(argc, argv, "NOPV:I:D:U:F:A:X:u:l:+")) != -1) @@ -134,7 +135,7 @@ void case 'w': dp = &optarg[n + 1]; - n += strlen(dp); + n += (int)strlen(dp); while (isspace(*dp)) dp++; for (i = NINCLUDE - 1; i >= 0; i--) @@ -172,7 +173,7 @@ void { if ((fp = strrchr(argv[optind], '/')) != NULL) { - int len = fp - argv[optind]; + int len = (int)(fp - argv[optind]); dp = (char *) newstring((uchar *) argv[optind], len + 1, 0); dp[len] = '\0'; @@ -232,3 +233,4 @@ void * #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/cpp/cpp.h b/soltools/cpp/cpp.h index 34e18579c35a..b85d28e0584e 100644 --- a/soltools/cpp/cpp.h +++ b/soltools/cpp/cpp.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* $Id: cpp.h,v 1.4 2006-06-20 05:07:28 hr Exp $ */ #define INS 32768 /* input buffer */ @@ -53,8 +54,8 @@ typedef struct token { unsigned char type; unsigned char flag; - unsigned int wslen; - unsigned int len; + size_t wslen; + size_t len; uchar *t; unsigned int identifier; /* used from macro processor to identify where a macro becomes valid again. */ } Token; @@ -64,7 +65,7 @@ typedef struct tokenrow Token *tp; /* current one to scan */ Token *bp; /* base (allocated value) */ Token *lp; /* last+1 token used */ - int max; /* number allocated */ + size_t max; /* number allocated */ } Tokenrow; typedef struct source @@ -86,7 +87,7 @@ typedef struct nlist { struct nlist *next; uchar *name; - int len; + size_t len; Tokenrow *vp; /* value as macro */ Tokenrow *ap; /* list of argument names, if any */ char val; /* value as preprocessor name */ @@ -143,16 +144,7 @@ void mvl_add( inout_pValidators, Nlist * in_pMacro, Token * in_pTokenWhereMacroBecomesValid); -/* Updates all token pointers within the list, when the tokens have - moved, by - pTokenWhereMacroBecomesValid += in_nNrofTokens; - . -void mvl_move( - MacroValidatorList * - inout_pValidators, - int in_nSpace); // in pointer units. -*/ /* Checks if one of the validators within the list points to the token in_pTokenToCheck. If so, the macro is set valid and the validator is removed. @@ -173,7 +165,7 @@ Source *setsource(char *, int, int, char *, int); void unsetsource(void); void puttokens(Tokenrow *); void process(Tokenrow *); -void *domalloc(int); +void *domalloc(size_t); void dofree(void *); void error(enum errtype, char *,...); void flushout(void); @@ -210,7 +202,7 @@ void setempty(Tokenrow *); void makespace(Tokenrow *, Token *); char *outnum(char *, int); int digit(int); -uchar *newstring(uchar *, int, int); +uchar *newstring(uchar *, size_t, size_t); #define rowlen(tokrow) ((tokrow)->lp - (tokrow)->bp) @@ -237,3 +229,4 @@ extern Includelist includelist[NINCLUDE]; extern Wraplist wraplist[NINCLUDE]; extern char wd[]; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/cpp/makefile.mk b/soltools/cpp/makefile.mk index 533cf9a91ab7..71c581a38325 100644 --- a/soltools/cpp/makefile.mk +++ b/soltools/cpp/makefile.mk @@ -55,7 +55,7 @@ OBJFILES= \ # nonstandard cpp options needed for Mac (-isysroot), # needs the custom stgetopt defined here :/ -.IF "$(OS)" == "MACOSX" || "$(HAVE_GETOPT)" != "YES" +.IF "$(OS)" == "MACOSX" || "$(OS)" == "AIX" || "$(HAVE_GETOPT)" != "YES" OBJFILES += $(OBJ)$/_getopt.obj .ENDIF .IF "$(HAVE_GETOPT)" == "YES" diff --git a/soltools/giparser/gen_info.cxx b/soltools/giparser/gen_info.cxx index 838e46287b0c..dd6973a3daef 100644 --- a/soltools/giparser/gen_info.cxx +++ b/soltools/giparser/gen_info.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -86,3 +87,4 @@ GenericInfo::CreateMyList() const } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/giparser/gi_list.cxx b/soltools/giparser/gi_list.cxx index 5726a2bf0740..ec03d0a6cd94 100644 --- a/soltools/giparser/gi_list.cxx +++ b/soltools/giparser/gi_list.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -142,9 +143,9 @@ List_GenericInfo::InsertInfoByPath( GenericInfo * let_dpInfo, { Simstr aKey( i_sKeyPath, 0, - sNextPathSegment - + (int)(sNextPathSegment - ( *sNextPathSegment == 0 ? 0 : 1) - - i_sKeyPath ); + - i_sKeyPath )); GenericInfo * pNew = new GenericInfo(aKey); InsertInfo(pNew,false); @@ -208,7 +209,7 @@ List_GenericInfo::lower_bound( bool & o_bExists, KeyPath i_sKeyPath ) { o_sNextPathSegment = strchr(i_sKeyPath, '/'); - Simstr sKey( i_sKeyPath, (o_sNextPathSegment == 0 ? strlen(i_sKeyPath) : o_sNextPathSegment++ - i_sKeyPath) ); + Simstr sKey( i_sKeyPath, (int)(o_sNextPathSegment == 0 ? strlen(i_sKeyPath) : o_sNextPathSegment++ - i_sKeyPath) ); GenericInfo aSearch(sKey); unsigned low = 0; @@ -232,3 +233,4 @@ List_GenericInfo::lower_bound( bool & o_bExists, return &aChildren[low]; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/giparser/gi_parse.cxx b/soltools/giparser/gi_parse.cxx index ad960e48a1e2..5ee68af64d7b 100644 --- a/soltools/giparser/gi_parse.cxx +++ b/soltools/giparser/gi_parse.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,7 +69,6 @@ GenericInfo_Parser::GenericInfo_Parser() nCurLine(0), nLevel(0), bGoon(false), - // sCurComment, eErrorCode(ok), nErrorLine(0), pResult(0), @@ -318,18 +318,8 @@ GenericInfo_Parser::WriteList( ostream & o_rFile ) { PushLevel_Write(); -/* - WriteIndentation(); - o_rFile.write("{",1); - o_rFile.write(C_sLineEnd, C_nLineEndLength); -*/ WriteList(o_rFile); -/* - WriteIndentation(); - o_rFile.write("}",1); - o_rFile.write(C_sLineEnd, C_nLineEndLength); -*/ PopLevel_Write(); } } // end for @@ -405,3 +395,4 @@ GenericInfo_Parser::WriteIndentation( ostream & o_rFile ) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/giparser/st_gilrw.cxx b/soltools/giparser/st_gilrw.cxx index d57d8811cb31..bc03cf4cc5f0 100644 --- a/soltools/giparser/st_gilrw.cxx +++ b/soltools/giparser/st_gilrw.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -106,75 +107,4 @@ ST_InfoListReader::CloseList() aListStack.pop_back(); } - -#if 0 -ST_InfoListWriter::ST_InfoListWriter() -{ - -} - -ST_InfoListWriter::~ST_InfoListWriter() - -bool -ST_InfoListWriter::SaveList( const Simstr & i_sFileName, - List_GenericInfo & io_rList ) -{ - -} - -E_Error -ST_InfoListWriter::GetLastError() const -{ - return dpParser->GetLastError(o_pErrorLine); -} - -bool -ST_InfoListWriter::Start_CurList() -{ - -} - -bool -ST_InfoListWriter::NextOf_CurList() -{ - -} - -void -ST_InfoListWriter::Get_CurKey( char * o_rKey ) const -{ - -} - -void -ST_InfoListWriter::Get_CurValue( char * o_rValue ) const -{ - -} - -void -ST_InfoListWriter::Get_CurComment( char * o_rComment ) const -{ - -} - -bool -ST_InfoListWriter::HasSubList_CurKey() const -{ - -} - -void -ST_InfoListWriter::Push_CurList() -{ - -} - -void -ST_InfoListWriter::Pop_CurList() -{ - -} -#endif - - +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/inc/gen_info.hxx b/soltools/inc/gen_info.hxx index fae89435bed7..d2a13fa25121 100644 --- a/soltools/inc/gen_info.hxx +++ b/soltools/inc/gen_info.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -87,3 +88,4 @@ class GenericInfo #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/inc/gi_list.hxx b/soltools/inc/gi_list.hxx index ad7f8d5e93f8..3444235837a5 100644 --- a/soltools/inc/gi_list.hxx +++ b/soltools/inc/gi_list.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -213,3 +214,4 @@ List_GenericInfo::End() #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/inc/gi_parse.hxx b/soltools/inc/gi_parse.hxx index 636e3bffcb9c..a807ed6e2cc0 100644 --- a/soltools/inc/gi_parse.hxx +++ b/soltools/inc/gi_parse.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -163,3 +164,4 @@ GenericInfo_Parser::GetLastError( UINT32 * o_pErrorLine ) const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/inc/gilacces.hxx b/soltools/inc/gilacces.hxx index f9dd4c21f4e3..e0702daa93cc 100644 --- a/soltools/inc/gilacces.hxx +++ b/soltools/inc/gilacces.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -102,3 +103,4 @@ class GenericInfoList_Browser #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/inc/pch/precompiled_soltools.cxx b/soltools/inc/pch/precompiled_soltools.cxx index 186dcaba7488..9acdfcf875d8 100644 --- a/soltools/inc/pch/precompiled_soltools.cxx +++ b/soltools/inc/pch/precompiled_soltools.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,3 +28,4 @@ #include "precompiled_soltools.hxx" +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/inc/pch/precompiled_soltools.hxx b/soltools/inc/pch/precompiled_soltools.hxx index ef1d1b1f0a1b..3fe93eb8c9fc 100644 --- a/soltools/inc/pch/precompiled_soltools.hxx +++ b/soltools/inc/pch/precompiled_soltools.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,3 +31,4 @@ #ifdef PRECOMPILED_HEADERS #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/inc/simstr.hxx b/soltools/inc/simstr.hxx index 883db0d96bdf..72c99dd93e18 100644 --- a/soltools/inc/simstr.hxx +++ b/soltools/inc/simstr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -221,3 +222,4 @@ Simstr::is_empty() const { return len == 0; } #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/inc/st_gilrw.hxx b/soltools/inc/st_gilrw.hxx index b70c52e1e75f..7617b503c9ee 100644 --- a/soltools/inc/st_gilrw.hxx +++ b/soltools/inc/st_gilrw.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -123,3 +124,4 @@ class ST_InfoListWriter : public GenericInfoParseTypes, #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/inc/st_list.hxx b/soltools/inc/st_list.hxx index adc791f7fdf2..66a85c1255bb 100644 --- a/soltools/inc/st_list.hxx +++ b/soltools/inc/st_list.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -62,7 +63,7 @@ class ST_List /// Soltools-List. void insert( iterator i_aPos, const XX & elem_ ) - { Insert(i_aPos-begin(), elem_); } + { Insert((unsigned)(i_aPos-begin()), elem_); } virtual void Insert( unsigned pos, const XX & elem ); @@ -71,7 +72,7 @@ class ST_List /// Soltools-List. { Insert(size(),elem_); } void remove( iterator i_aPos ) - { Remove(i_aPos-begin()); } + { Remove((int)(i_aPos-begin())); } virtual void Remove( unsigned pos ); void pop_back() { Remove(size()-1); } @@ -328,3 +329,4 @@ DynamicList<XY>::Remove( unsigned pos ) #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/inc/st_types.hxx b/soltools/inc/st_types.hxx index 29eb7396440c..4aa87d6b81d2 100644 --- a/soltools/inc/st_types.hxx +++ b/soltools/inc/st_types.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,3 +39,4 @@ typedef short INT16; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/javadep/javadep.c b/soltools/javadep/javadep.c index d0517d832f45..86032c7f7cc9 100644 --- a/soltools/javadep/javadep.c +++ b/soltools/javadep/javadep.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -118,7 +119,7 @@ static char *pout_file = NULL; uint8 read_uint8(const file_t *pfile); uint16 read_uint16(const file_t *pfile); uint32 read_uint32(const file_t *pfile); -void skip_bytes(const file_t *pfile, const size_t nnum); +void skip_bytes(const file_t *pfile, const long nnum); char *escape_slash(const char *pstr); int is_inner(const char *pstr); void print_dependencies(const struct growable *pdep, @@ -151,7 +152,7 @@ uint8 read_uint8(const file_t *pfile) { /* read a byte from classfile */ - int nread; + size_t nread; uint8 ndata; nread = fread(&ndata, sizeof(uint8), 1, pfile->pfs); if ( !nread ) { @@ -165,7 +166,7 @@ uint16 read_uint16(const file_t *pfile) { /* read a short from classfile and convert it to host format */ - int nread; + size_t nread; uint16 ndata; nread = fread(&ndata, sizeof(uint16), 1, pfile->pfs); if ( !nread ) { @@ -180,7 +181,7 @@ uint32 read_uint32(const file_t *pfile) { /* read an int from classfile and convert it to host format */ - int nread; + size_t nread; uint32 ndata; nread = fread(&ndata, sizeof(uint32), 1, pfile->pfs); if ( !nread ) { @@ -202,7 +203,7 @@ read_utf8(const file_t *pfile) */ utf8_t a_utf8; - int nread; + size_t nread; a_utf8.pdata = NULL; @@ -254,7 +255,7 @@ char *utf8tolatin1(const utf8_t a_utf8) void -skip_bytes(const file_t *pfile, const size_t nnumber) +skip_bytes(const file_t *pfile, const long nnumber) { /* skip a nnumber of bytes in classfile */ if ( fseek(pfile->pfs, nnumber, SEEK_CUR) == -1 ) @@ -269,7 +270,7 @@ add_to_dependencies(struct growable *pdep, { /* create dependencies */ int i; - int nlen_filt, nlen_str, nlen_pdepstr; + size_t nlen_filt, nlen_str, nlen_pdepstr; char *pstr, *ptrunc; char path[PATH_MAX+1]; char cnp_class_file[PATH_MAX+1]; @@ -344,7 +345,7 @@ escape_slash(const char *pstr) const char *pp = pstr; char *p, *pnp; char *pnew_str; - int nlen_pnp, nlen_pp; + size_t nlen_pnp, nlen_pp; int i = 0; while ( (p=strchr(pp, cpathsep)) != NULL ) { @@ -453,9 +454,12 @@ process_class_file(const char *pfilename, const struct growable *pfilt) ncnt = read_uint16(&file); #ifdef DEBUG - printf("Magic: %p\n", (void*)nmagic); + printf("Magic: %x\n", nmagic); printf("Major %d, Minor %d\n", nmajor, nminor); printf("Const_pool_count %d\n", ncnt); +#else + (void)nmajor; + (void)nminor; #endif /* There can be ncount entries in the constant_pool table @@ -603,9 +607,11 @@ xcalloc(size_t nmemb, size_t size) void * xrealloc(void *ptr, size_t size) { - ptr = realloc(ptr, size); + void *newptr = realloc(ptr, size); - if ( !ptr ) + if (newptr) + ptr = newptr; + else err_quit("out of memory"); return ptr; @@ -703,7 +709,8 @@ void create_filters(struct growable *pfilt, const struct growable *pinc) { char *p, *pp, *pstr; - int i, nlen, nlen_pstr; + int i; + size_t nlen, nlen_pstr; /* break up includes into filter list */ for ( i = 0; i < pinc->ncur; i++ ) { pp = pinc->parray[i]; @@ -909,3 +916,4 @@ main(int argc, char *argv[]) exit(0); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/ldump/hashtbl.cxx b/soltools/ldump/hashtbl.cxx index 27d48926f0df..712357f3a7fe 100644 --- a/soltools/ldump/hashtbl.cxx +++ b/soltools/ldump/hashtbl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -100,19 +101,6 @@ HashTable::~HashTable() // Problem: Virtuelle Funktionen sind im Destructor nicht virtuell!! // Der Code mu deshalb ins Macro - /* - if (m_bOwner) - { - for (ULONG i=0; i<GetSize(); i++) - { - void *pObject = GetObjectAt(i); - - if (pObject != NULL) - OnDeleteObject(pObject()); - } - } - */ - // Speicher fr HashItems freigeben delete [] m_pData; } @@ -456,3 +444,5 @@ void* HashTableIterator::FindValidObject(bool bForward) return pObject; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/ldump/hashtbl.hxx b/soltools/ldump/hashtbl.hxx index 62d1f8e9120e..b3aa621dcb21 100644 --- a/soltools/ldump/hashtbl.hxx +++ b/soltools/ldump/hashtbl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -109,3 +110,4 @@ public: #endif // _HASHTBL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/ldump/ldump.cxx b/soltools/ldump/ldump.cxx index 8c6e85b62594..ebe6983e18be 100644 --- a/soltools/ldump/ldump.cxx +++ b/soltools/ldump/ldump.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -164,7 +165,6 @@ bool LibDump::Dump() *pEnd = '\0'; strncpy( aBuf, pFound, strlen( pFound)); aBuf[ strlen( pFound) ] = '\0'; -// fprintf( stderr, "\n--- %s\n", aBuf); break; } else @@ -175,7 +175,7 @@ bool LibDump::Dump() } } - if ((aBuf[0] =='?') || !strncmp(aBuf, "__CT",4)) + if (aBuf[0] =='?') { nLen = (int) strlen(aBuf); memset( aName, 0, sizeof( aName ) ); @@ -191,7 +191,10 @@ bool LibDump::Dump() // und raus damit PrintSym( aName, bExportByName ); } - else if ( bAll == true ) + else if ( bAll == true && + strncmp(aBuf, "__real@", 7) != 0 && + strncmp(aBuf, "__CT",4) != 0 && + strncmp(aBuf, "__TI3?", 6) != 0 ) { int nPreLen = (int) strlen( cAPrefix ); @@ -207,11 +210,12 @@ bool LibDump::Dump() nName++; } } - //fprintf( stderr, "Gefundenen Prefix : %s %d \n", aTmpBuf, nPreLen ); // den ersten _ raus nLen = (int) strlen(aName); +#ifndef _WIN64 if (aName[0] == '_') strcpy( aBuf , &aName[1] ); +#endif strncpy ( aTmpBuf, aBuf, (size_t) nPreLen ); aTmpBuf[nPreLen] = '\0'; if ( !strcmp( aTmpBuf, cAPrefix )) @@ -219,13 +223,13 @@ bool LibDump::Dump() if ( bLdump3 ) { int nChar = '@'; char *pNeu = strchr( aBuf, nChar ); - int nPos = pNeu - aBuf + 1; + size_t nPos = pNeu - aBuf + 1; if ( nPos > 0 ) { char aOldBuf[MAX_MAN]; strcpy( aOldBuf, aBuf ); char pChar[MAX_MAN]; - strncpy( pChar, aBuf, (size_t) (nPos -1) ); + strncpy( pChar, aBuf, nPos - 1 ); pChar[nPos-1] = '\0'; strcpy( aBuf, pChar ); strcat( aBuf, "=" ); @@ -574,7 +578,6 @@ LibDump::~LibDump() { delete [] cBName; delete [] cAPrefix; -// delete [] cLibName; delete [] cFilterName; delete [] cModName; } @@ -754,5 +757,8 @@ main( int argc, char **argv ) pDump->PrintDefFile(); pDump->PrintDataBase(); delete pDump; + delete [] pLibName; return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/ldump/ldump.hxx b/soltools/ldump/ldump.hxx index c0a1a166b8b2..6f4406463bba 100644 --- a/soltools/ldump/ldump.hxx +++ b/soltools/ldump/ldump.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -76,3 +77,4 @@ public: static void DumpError(unsigned long nError); }; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/mkdepend/collectdircontent.cxx b/soltools/mkdepend/collectdircontent.cxx index c9308faf0562..884456a382c9 100755..100644 --- a/soltools/mkdepend/collectdircontent.cxx +++ b/soltools/mkdepend/collectdircontent.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #include "collectdircontent.hxx" PathFilePair IncludesCollection::split_path(const string& filePath) { @@ -41,6 +42,7 @@ void IncludesCollection::add_to_collection(const string& dirPath) { while ((pent = readdir(pdir))) { dirContent.insert(pent->d_name); }; + closedir(pdir); #endif // defined( WNT ) allIncludes.insert(EntriesPair(dirPath, dirContent)); }; @@ -64,7 +66,6 @@ bool IncludesCollection::exists(string filePath) { } else { return true; }; - //return false; }; extern "C" { @@ -81,3 +82,5 @@ extern "C" { return m->exists(filePath); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/mkdepend/collectdircontent.hxx b/soltools/mkdepend/collectdircontent.hxx index 1896df0c8bc7..0c6b42357855 100644 --- a/soltools/mkdepend/collectdircontent.hxx +++ b/soltools/mkdepend/collectdircontent.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #ifndef COLLECTDIRCONTENT_H #define COLLECTDIRCONTENT_H @@ -27,8 +28,6 @@ typedef pair<string, string> PathFilePair; struct IncludesCollection { private: DirMap allIncludes; -// bool search(string filePath); -// bool add_dir(string dirPath); PathFilePair split_path(const string& filePath); void add_to_collection(const string& dirPath); @@ -55,4 +54,6 @@ int call_IncludesCollection_exists(struct IncludesCollection* m, const char* fil } #endif -#endif // COLLECTDIRCONTENT_H +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/mkdepend/cppsetup.c b/soltools/mkdepend/cppsetup.c index 173798105a3c..6a4d2b8cf68a 100644 --- a/soltools/mkdepend/cppsetup.c +++ b/soltools/mkdepend/cppsetup.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* $XConsortium: cppsetup.c,v 1.13 94/04/17 20:10:32 gildea Exp $ */ /* @@ -232,3 +233,4 @@ int cppsetup(line, filep, inc) } #endif /* CPP */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/mkdepend/def.h b/soltools/mkdepend/def.h index 4133326ddb70..cafa0b759be0 100644 --- a/soltools/mkdepend/def.h +++ b/soltools/mkdepend/def.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* $XConsortium: def.h,v 1.25 94/04/17 20:10:33 gildea Exp $ */ /* @@ -187,3 +188,5 @@ void warning1(char *, ...); void convert_slashes(char *); char *append_slash(char *); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/mkdepend/ifparser.c b/soltools/mkdepend/ifparser.c index 3c47de64e2f0..abfb92c9e48a 100644 --- a/soltools/mkdepend/ifparser.c +++ b/soltools/mkdepend/ifparser.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * $XConsortium: ifparser.c,v 1.8 95/06/03 00:01:41 gildea Exp $ * @@ -102,7 +103,10 @@ parse_number (g, cp, valp) return CALLFUNC(g, handle_error) (g, cp, "number"); #ifdef WIN32 - *valp = strtol(cp, &cp, 0); + { + char *cp2; + *valp = strtol(cp, &cp2, 0); + } #else *valp = atoi (cp); /* EMPTY */ @@ -171,7 +175,7 @@ parse_value (g, cp, valp) cp++; } DO (cp = parse_variable (g, cp, &var)); - len = cp - var; + len = (int)(cp - var); SKIPSPACE (cp); if (paren && *cp != ')') return CALLFUNC(g, handle_error) (g, cp, ")"); @@ -458,3 +462,4 @@ ParseIfExpression (g, cp, valp) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/mkdepend/ifparser.h b/soltools/mkdepend/ifparser.h index d832bfbcb6d7..e6cb5686c3f1 100644 --- a/soltools/mkdepend/ifparser.h +++ b/soltools/mkdepend/ifparser.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * $XConsortium: ifparser.h,v 1.1 92/08/22 13:05:39 rws Exp $ * @@ -73,3 +74,4 @@ typedef struct _if_parser { const char *ParseIfExpression (/* IfParser *, const char *, int * */); +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/mkdepend/imakemdep.h b/soltools/mkdepend/imakemdep.h index 67a98929c904..bd42dece5efc 100644 --- a/soltools/mkdepend/imakemdep.h +++ b/soltools/mkdepend/imakemdep.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* $XConsortium: imakemdep.h,v 1.83 95/04/07 19:47:46 kaleb Exp $ */ /* $XFree86: xc/config/imake/imakemdep.h,v 3.12 1995/07/08 10:22:17 dawes Exp $ */ @@ -42,14 +43,6 @@ in this Software without prior written authorization from the X Consortium. * These will be passed to the compile along with the contents of the * make variable BOOTSTRAPCFLAGS. */ -#ifdef hpux -#ifdef hp9000s800 -#define imake_ccflags "-DSYSV" -#else -#define imake_ccflags "-Wc,-Nd4000,-Ns3000 -DSYSV" -#endif -#endif - #if defined(macII) || defined(_AUX_SOURCE) #define imake_ccflags "-DmacII -DSYSV" #endif @@ -207,9 +200,6 @@ in this Software without prior written authorization from the X Consortium. * If use cc -E but want a different compiler, define DEFAULT_CC. * If the cpp you need is not in /lib/cpp, define DEFAULT_CPP. */ -#ifdef hpux -#define USE_CC_E -#endif #ifdef WIN32 #define USE_CC_E #define DEFAULT_CC "cl" @@ -235,7 +225,7 @@ in this Software without prior written authorization from the X Consortium. #ifdef _CRAY #define DEFAULT_CPP "/lib/pcpp" #endif -#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) +#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) #define DEFAULT_CPP "/usr/libexec/cpp" #endif #ifdef MACH @@ -273,7 +263,9 @@ char *cpp_argv[ARGUMENTS] = { #ifdef unix "-Uunix", /* remove unix symbol so that filename unix.c okay */ #endif -#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(MACH) +#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || \ + defined(MACH) || defined(DRAGONFLY) +/* FIXME: strange list of obsolete systems */ # ifdef __i386__ "-D__i386__", # endif @@ -513,6 +505,8 @@ char *cpp_argv[ARGUMENTS] = { * them to the the following table. The definition of struct symtab is * in util/makedepend/def.h. */ + +/* FIXME: strange list of obsolete systems */ struct pair predefs[] = { #ifdef apollo {"apollo", "1", NULL}, @@ -544,18 +538,6 @@ struct pair predefs[] = { #ifdef __sparc__ {"__sparc__", "1", NULL}, #endif -#ifdef hpux - {"hpux", "1", NULL}, -#endif -#ifdef __hpux - {"__hpux", "1", NULL}, -#endif -#ifdef __hp9000s800 - {"__hp9000s800", "1", NULL}, -#endif -#ifdef __hp9000s700 - {"__hp9000s700", "1", NULL}, -#endif #ifdef vax {"vax", "1", NULL}, #endif @@ -719,6 +701,9 @@ struct pair predefs[] = { #ifdef __OpenBSD__ {"__OpenBSD__", "1", NULL}, #endif +#ifdef __DragonFly__ + {"__DragonFly__", "1", NULL}, +#endif #ifdef __EMX__ {"__EMX__", "1", NULL}, #endif @@ -728,3 +713,5 @@ struct pair predefs[] = { #endif /* MAKEDEPEND */ #endif /* CCIMAKE */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/mkdepend/include.c b/soltools/mkdepend/include.c index 4446489ba259..d0bd763bcd43 100644 --- a/soltools/mkdepend/include.c +++ b/soltools/mkdepend/include.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* $XConsortium: include.c,v 1.17 94/12/05 19:33:08 gildea Exp $ */ /* @@ -215,7 +216,7 @@ void remove_dotdot(path) int isdot(p) register char *p; { - if(p && *p++ == '.' && *p++ == '\0') + if(p && p[0] == '.' && p[1] == '\0') return(TRUE); return(FALSE); } @@ -223,7 +224,7 @@ int isdot(p) int isdotdot(p) register char *p; { - if(p && *p++ == '.' && *p++ == '.' && *p++ == '\0') + if(p && p[0] == '.' && p[1] == '.' && p[2] == '\0') return(TRUE); return(FALSE); } @@ -293,7 +294,7 @@ void included_by(ip, newfile) else { for (i=0; i<ip->i_listlen; i++) if (ip->i_list[ i ] == newfile) { - i = strlen(newfile->i_file); + i = (int)strlen(newfile->i_file); if (!ip->i_included_sym && !(i > 2 && newfile->i_file[i-1] == 'c' && @@ -327,3 +328,5 @@ void inc_clean () ip->i_marked = FALSE; } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/mkdepend/main.c b/soltools/mkdepend/main.c index cf5c42c14bdf..bddeeba988cc 100644 --- a/soltools/mkdepend/main.c +++ b/soltools/mkdepend/main.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* $XConsortium: main.c,v 1.84 94/11/30 16:10:44 kaleb Exp $ */ /* $XFree86: xc/config/makedepend/main.c,v 3.4 1995/07/15 14:53:49 dawes Exp $ */ /* @@ -32,6 +33,10 @@ in this Software without prior written authorization from the X Consortium. #include <sys/stat.h> #endif +#ifdef _WIN32 +#include <io.h> +#endif + #ifdef _MSC_VER /* Define ssize_t */ #if !defined(_W64) @@ -346,7 +351,6 @@ int main(argc, argv) break; default: if (endmarker) break; - /* fatalerr("unknown opt = %s\n", argv[0]); */ warning("ignoring option %s\n", argv[0]); } } @@ -797,3 +801,4 @@ char* append_slash(path) return new_string; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/mkdepend/makefile.mk b/soltools/mkdepend/makefile.mk index 630c688faba2..460b9f8a5ad1 100644 --- a/soltools/mkdepend/makefile.mk +++ b/soltools/mkdepend/makefile.mk @@ -48,6 +48,14 @@ UWINAPILIB= CDEFS+=-DNO_X11 -DXP_PC -DHW_THREADS +.IF "$(COM)" == "MSC" +# C4100: unreferenced formal parameter +# C4131: uses old-style declarator +# C4242: conversion from 'int' to 'char', possible loss of data +# C4706: assignment within conditional expression +CDEFS+=-wd4100 -wd4131 -wd4242 -wd4706 +.ENDIF + OBJFILES= \ $(OBJ)$/cppsetup.obj \ $(OBJ)$/ifparser.obj \ diff --git a/soltools/mkdepend/parse.c b/soltools/mkdepend/parse.c index 31d48bf2bbc5..a63e481b6cdd 100644 --- a/soltools/mkdepend/parse.c +++ b/soltools/mkdepend/parse.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* $XConsortium: parse.c,v 1.30 94/04/17 20:10:38 gildea Exp $ */ /* @@ -346,7 +347,7 @@ int deftype (line, filep, file_red, file, parse_it, symbols) /* * copy the definition back to the beginning of the line. */ - strcpy (line, p); + memmove (line, p, strlen(p)); break; case ELSE: case ENDIF: @@ -419,14 +420,12 @@ static int hash( str ) { /* Hash (Kernighan and Ritchie) */ register unsigned int hashval = 0; - //char *s = str; for ( ; *str; str++ ) { hashval = ( hashval * SYMHASHSEED ) + ( *str ); } - //fprintf( stderr, "hash: %s, %d\n", s, hashval & ( SYMHASHMEMBERS - 1 ) ); return hashval & ( SYMHASHMEMBERS - 1 ); } @@ -612,3 +611,5 @@ void hash_undefine( symbol, symbols ) } } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/mkdepend/pr.c b/soltools/mkdepend/pr.c index 1319972f99c5..37bf3a2af035 100644 --- a/soltools/mkdepend/pr.c +++ b/soltools/mkdepend/pr.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* $XConsortium: pr.c,v 1.17 94/04/17 20:10:38 gildea Exp $ */ /* @@ -110,12 +111,12 @@ void pr(ip, file, base) char buf[ BUFSIZ ]; printed = TRUE; - len = strlen(ip->i_file)+1; + len = (int)strlen(ip->i_file)+1; if (current_len + len > width || file != lastfile) { lastfile = file; sprintf(buf, "\n%s%s%s: %s", objprefix, base, objsuffix, ip->i_file); - len = current_len = strlen(buf); + len = current_len = (int)strlen(buf); } else { buf[0] = ' '; @@ -135,3 +136,5 @@ void pr(ip, file, base) for (i=0; i<ip->i_listlen; i++) printf("\n#\t%s", ip->i_list[ i ]->i_incstring); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/support/simstr.cxx b/soltools/support/simstr.cxx index d2ecf3480677..de9890a4a060 100644 --- a/soltools/support/simstr.cxx +++ b/soltools/support/simstr.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,7 +50,7 @@ Simstr::Simstr(const char * s_) } else { - len = strlen(s_); + len = (int)strlen(s_); sz = new char[len+1]; memcpy(sz,s_,len+1); } @@ -96,7 +97,7 @@ Simstr::Simstr( const char * anybytes, int firstBytesPos, int nrOfBytes) { - unsigned slen = strlen(anybytes); + unsigned slen = (unsigned)strlen(anybytes); if (anybytes == 0 || slen <= unsigned(firstBytesPos)) { len = 0; @@ -831,3 +832,4 @@ operator>=(const char * str, const Simstr & S) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/testSHL/inc/tlog.hxx b/soltools/testSHL/inc/tlog.hxx index acae18be7e9f..fa38483efd38 100644 --- a/soltools/testSHL/inc/tlog.hxx +++ b/soltools/testSHL/inc/tlog.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,18 +31,14 @@ #include <osl/file.hxx> #include <rtl/tres.hxx> -#ifndef _SOLTOOLS_TESTSHL_TUTIL_HXX_ #include "tutil.hxx" -#endif #include <iostream> using namespace std; -// <namespace_tstutl> namespace tstutl { -// <class_tLog> class tLog { // <private_members> @@ -98,3 +95,5 @@ public: } // </namespace_tstutl> #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/testSHL/inc/tstMgr.hxx b/soltools/testSHL/inc/tstMgr.hxx index 208714322395..cbb8474b68af 100644 --- a/soltools/testSHL/inc/tstMgr.hxx +++ b/soltools/testSHL/inc/tstMgr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,7 +50,7 @@ class tstMgr { // </private_methods> public: - + tstMgr() : pImpl(0) {} // <dtor> ~tstMgr(){ cleanup(); @@ -71,3 +72,4 @@ public: +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/testSHL/inc/tutil.hxx b/soltools/testSHL/inc/tutil.hxx index 37398a72381a..76c12b314548 100644 --- a/soltools/testSHL/inc/tutil.hxx +++ b/soltools/testSHL/inc/tutil.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,3 +48,5 @@ sal_uInt32 ln( const sal_Char* str ); } // </namespace_tstutl> #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/testSHL/testshl.cxx b/soltools/testSHL/testshl.cxx index 9642d8761f50..15ca5fedda95 100644 --- a/soltools/testSHL/testshl.cxx +++ b/soltools/testSHL/testshl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,13 +31,9 @@ #include <stdio.h> -#ifndef _SOLTOOLS_TESTSHL_TLOG_HXX_ #include "inc/tlog.hxx" -#endif -#ifndef _SOLTOOLS_TESTSHL_TSTMGR_HXX_ #include "inc/tstMgr.hxx" -#endif using namespace tstutl; @@ -96,3 +93,4 @@ void usage(){ exit(0); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/testSHL/util/tlog.cxx b/soltools/testSHL/util/tlog.cxx index 48eeafc7908a..9f2e86d4cc8a 100644 --- a/soltools/testSHL/util/tlog.cxx +++ b/soltools/testSHL/util/tlog.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -51,8 +52,8 @@ void tLog::initialize( const ::rtl::OString& name ) { ret = ::osl::File::remove( m_logname ); } - if( m_logfile->open( OpenFlag_Write ) == ::osl::FileBase::E_NOENT ) { - ret = m_logfile->open( OpenFlag_Write | OpenFlag_Create ); + if( m_logfile->open( osl_File_OpenFlag_Write ) == ::osl::FileBase::E_NOENT ) { + ret = m_logfile->open( osl_File_OpenFlag_Write | osl_File_OpenFlag_Create ); } else { ret = m_logfile->setPos( Pos_End, 0 ); @@ -92,7 +93,6 @@ void tLog::initialize( const ::rtl::OString& name ) { } sal_uInt64 uBytes=0; sal_uInt32 len = ln( buf ); - const sal_Char* ptr = buf; if ( v ) { fprintf( stderr, "%s", buf ); @@ -106,3 +106,4 @@ void tLog::initialize( const ::rtl::OString& name ) { +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/testSHL/util/tstMgr.cxx b/soltools/testSHL/util/tstMgr.cxx index 2aad1c758d41..7fa2bd7e40ad 100644 --- a/soltools/testSHL/util/tstMgr.cxx +++ b/soltools/testSHL/util/tstMgr.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,13 +32,9 @@ #include <osl/module.hxx> #include <rtl/tres.hxx> -#ifndef _SOLTOOLS_TESTSHL_TLOG_HXX_ #include "tlog.hxx" -#endif -#ifndef _SOLTOOLS_TESTSHL_TUTIL_HXX_ #include "tutil.hxx" -#endif using namespace rtl; @@ -83,7 +80,7 @@ sal_Bool tstMgr::test_Entries( vector< sal_Char* > entries, bOK &= oRes.getState(); log.writeRes( oRes ); } - iter++; + ++iter; } log.close(); } @@ -117,7 +114,7 @@ sal_Bool tstMgr::test_EntriesFromFile( sal_Char* fName, sal_Char* logName ) { if ( *iter ) { delete [] *iter; } - iter++; + ++iter; } } else { @@ -162,3 +159,5 @@ void test_Entry_Impl( ::osl::Module& oMod, ::rtl::TestResult* oRes ) { } // </function_test_Entry_Impl> } // </namespace_tstutl> + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/testSHL/util/tutil.cxx b/soltools/testSHL/util/tutil.cxx index 60c5f6deba02..81d068917101 100644 --- a/soltools/testSHL/util/tutil.cxx +++ b/soltools/testSHL/util/tutil.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,7 +75,7 @@ sal_uInt32 getEntriesFromFile( sal_Char* fName, vector< sal_Char* >& entries ) { ::osl::File inFile( cnvrtPth( fName ) ); - if ( inFile.open( OpenFlag_Read ) == ::osl::FileBase::E_None) { + if ( inFile.open( osl_File_OpenFlag_Read ) == ::osl::FileBase::E_None) { ::rtl::ByteSequence byteSeq; inFile.readLine( byteSeq ); while ( byteSeq.getLength() ) { @@ -145,3 +146,4 @@ sal_uInt32 ln( const sal_Char* str ) { } // </namespace_tstutl> +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/testhxx/testhxx.cxx b/soltools/testhxx/testhxx.cxx index 63b15276d523..be365044b861 100644 --- a/soltools/testhxx/testhxx.cxx +++ b/soltools/testhxx/testhxx.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,3 +31,5 @@ //#include "precompiled_soltools.hxx" // This is just a dummy file; see the makefile.mk for the real work. + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/util/makefile.pmk b/soltools/util/makefile.pmk index bf51cf851b4c..003cf1c203c2 100755 --- a/soltools/util/makefile.pmk +++ b/soltools/util/makefile.pmk @@ -31,14 +31,6 @@ MAKEDEPEND=$(AUGMENT_LIBRARY_PATH) $(BIN)$/makedepend # find 'adjustvisibility' in own output tree ADJUSTVISIBILITY=$(AUGMENT_LIBRARY_PATH) $(BIN)$/adjustvisibility -# avoid STLPort -NO_DEFAULT_STL=TRUE -SOLARINC!:=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(SOLARINC)) -.IF "$(STLPORT4)" != "" -SOLARINC!:=$(subst,$(STLPORT4)/include/stlport,dont_use_stl$(SPACECHAR) $(SOLARINC)) -SOLARINC!:=$(subst,$(STLPORT4)/stlport,dont_use_stl$(SPACECHAR) $(SOLARINC)) -.ENDIF - .IF "$(OS)"=="SOLARIS" # hack due to #i53089# .IF "$(COMPATH:+"x")" != "$(COMPATH:+"x":s/binx//)" @@ -46,7 +38,5 @@ HELP_COMPATH:=$(subst,/binx, $(COMPATH:+"x")) .ELSE # "$(COMPATH:+"x")" == "$(COMPATH:s/binx//)/binx" HELP_COMPATH:=$(COMPATH) .ENDIF # "$(COMPATH:+"x")" == "$(COMPATH:s/binx//)/binx" -#SOLARINC+=-I$(HELP_COMPATH)/prod/include/CC/stlport4 -#SOLARLIB+=-L$(HELP_COMPATH)/prod/lib/stlport4 SOLARINC+=-I$(HELP_COMPATH)/prod/include/CC/Cstd .ENDIF diff --git a/soltools/winunistd/unistd.h b/soltools/winunistd/unistd.h index 372e40050187..72c253e0af41 100644 --- a/soltools/winunistd/unistd.h +++ b/soltools/winunistd/unistd.h @@ -1,4 +1,6 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* Dummy unistd.h for the wntmsci3 environment. Required because flex * generates a lexical scanner which includes <unistd.h> */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |