diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:19:24 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:19:24 +0000 |
| commit | 9aff6949dbb9c61e21064b31f8e2f2e60e0dd24c (patch) | |
| tree | aaac00496e924d23fc8fcc71850ae59ab8ff7d16 /sal/osl/unx/signal.c | |
| parent | cbba07ab65fed1c99b298bc817580fdbc15be77d (diff) | |
INTEGRATION: CWS warnings01 (1.27.32); FILE MERGED
2006/01/27 08:17:32 sb 1.27.32.5: #i53898# Made code warning-free.
2006/01/25 22:01:25 sb 1.27.32.4: RESYNC: (1.28-1.29); FILE MERGED
2005/11/07 12:11:28 sb 1.27.32.3: #i53898# Made code warning-free (additional -W switches for GCC).
2005/09/23 00:55:09 sb 1.27.32.2: RESYNC: (1.27-1.28); FILE MERGED
2005/08/29 13:56:00 sb 1.27.32.1: #i53898# Made code warning-free.
Diffstat (limited to 'sal/osl/unx/signal.c')
| -rw-r--r-- | sal/osl/unx/signal.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/sal/osl/unx/signal.c b/sal/osl/unx/signal.c index fb433d9eba0d..565367319d36 100644 --- a/sal/osl/unx/signal.c +++ b/sal/osl/unx/signal.c @@ -4,9 +4,9 @@ * * $RCSfile: signal.c,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: rt $ $Date: 2005-11-11 12:25:28 $ + * last change: $Author: hr $ $Date: 2006-06-20 04:19:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -178,16 +178,16 @@ static void getExecutableName_Impl (rtl_String ** ppstrProgName) static sal_Bool is_soffice_Impl (void) { - sal_Int32 index = -1; + sal_Int32 idx = -1; rtl_String * strProgName = 0; getExecutableName_Impl (&strProgName); if (strProgName) { - index = rtl_str_indexOfStr (rtl_string_getStr (strProgName), "soffice"); + idx = rtl_str_indexOfStr (rtl_string_getStr (strProgName), "soffice"); rtl_string_release (strProgName); } - return (index != -1); + return (idx != -1); } static sal_Bool InitSignal() @@ -388,13 +388,13 @@ static int ReportCrash( int Signal ) static sal_Bool bCrashReporterExecuted = sal_False; sal_Bool bAutoCrashReport = sal_False; - if ( !bErrorReportingEnabled ) - return -1; - sal_uInt32 argi; sal_uInt32 argc; rtl_uString *ustrCommandArg = NULL; + if ( !bErrorReportingEnabled ) + return -1; + argc = osl_getCommandArgCount(); for ( argi = 0; argi < argc; argi++ ) @@ -518,7 +518,7 @@ static int ReportCrash( int Signal ) if ( dladdr( stackframes[iFrame], &dl_info) ) { const char *dli_fname = NULL; - const char *dli_fdir = NULL; + char *dli_fdir = NULL; char szDirectory[PATH_MAX]; char szCanonicDirectory[PATH_MAX]; @@ -548,12 +548,14 @@ static int ReportCrash( int Signal ) dl_info.dli_fname, checksum, sizeof(checksum) ); if ( nBytesProcessed ) { - int i; + int j; fprintf( checksumout, "<errormail:Checksum sum=\"0x" ); - for ( i = 0; i < 16; fprintf( checksumout, "%02X", checksum[i++] ) ); - fprintf( checksumout, "\" bytes=\"%d\" file=\"%s\"/>\n", - nBytesProcessed, + for ( j = 0; j < 16; fprintf( checksumout, "%02X", checksum[j++] ) ); + fprintf( checksumout, + "\" bytes=\"%lu\" file=\"%s\"/>\n", + SAL_INT_CAST( + unsigned long, nBytesProcessed), dli_fname ); } } |