rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-19 15:00:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: fix compiler warnings

Browse Source 
We have seen some new warnings after moving to newer SUSE inside the
testbench, and thus a newer compiler versions. This commit fixes them.
This commit is contained in:
Rainer Gerhards 2016-09-07 14:58:51 +02:00
parent 875764cb86
commit cd6816f1e1
2 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/lmsig_gt.c
View File

@ -82,7 +82,7 @@ ENDobjDestruct(lmsig_gt)
* after construction, but before the OnFileOpen() entry point. * after construction, but before the OnFileOpen() entry point.
* Defaults are expected to have been set during construction. * Defaults are expected to have been set during construction.
*/ */
rsRetVal static rsRetVal
SetCnfParam(void *pT, struct nvlst *lst) SetCnfParam(void *pT, struct nvlst *lst)
{ {
lmsig_gt_t *pThis = (lmsig_gt_t*) pT; lmsig_gt_t *pThis = (lmsig_gt_t*) pT;
@ -202,7 +202,7 @@ BEGINObjClassInit(lmsig_gt, 1, OBJ_IS_LOADABLE_MODULE) /* class, version */
CHKiRet(objUse(errmsg, CORE_COMPONENT)); CHKiRet(objUse(errmsg, CORE_COMPONENT));
CHKiRet(objUse(glbl, CORE_COMPONENT)); CHKiRet(objUse(glbl, CORE_COMPONENT));
if(rsgtInit("rsyslogd " VERSION) != 0) { if(rsgtInit((char*)"rsyslogd " VERSION) != 0) {
errmsg.LogError(0, RS_RET_SIGPROV_ERR, "error initializing " errmsg.LogError(0, RS_RET_SIGPROV_ERR, "error initializing "
"signature provider - cannot sign"); "signature provider - cannot sign");
ABORT_FINALIZE(RS_RET_SIGPROV_ERR); ABORT_FINALIZE(RS_RET_SIGPROV_ERR);

67
tools/rsgtutil.c
View File

@ -49,18 +49,20 @@ typedef unsigned char uchar;
static enum { MD_DUMP, MD_DETECT_FILE_TYPE, MD_SHOW_SIGBLK_PARAMS, static enum { MD_DUMP, MD_DETECT_FILE_TYPE, MD_SHOW_SIGBLK_PARAMS,
MD_VERIFY, MD_EXTEND, MD_CONVERT, MD_EXTRACT MD_VERIFY, MD_EXTEND, MD_CONVERT, MD_EXTRACT
} mode = MD_DUMP; } mode = MD_DUMP;
#ifdef ENABLEKSI
static enum { FILEMODE_LOGSIG, FILEMODE_RECSIG } filemode = FILEMODE_LOGSIG; static enum { FILEMODE_LOGSIG, FILEMODE_RECSIG } filemode = FILEMODE_LOGSIG;
#endif
static enum { API_GT, API_KSI } apimode = API_GT; static enum { API_GT, API_KSI } apimode = API_GT;
static int verbose = 0; static int verbose = 0;
static int debug = 0; static int debug = 0;
/* Helper variables for EXTRACT Mode */ /* Helper variables for EXTRACT Mode */
static int append = 0; static int append = 0;
char *outputfile = NULL; char *outputfile = NULL;
char *linenumbers = ""; const char *linenumbers = "";
#ifdef ENABLEGT #ifdef ENABLEGT
static void static void
dumpFile(char *name) dumpFile(const char *name)
{ {
FILE *fp; FILE *fp;
char hdr[9]; char hdr[9];
@ -104,7 +106,7 @@ err:
} }
static void static void
showSigblkParams(char *name) showSigblkParams(const char *name)
{ {
FILE *fp; FILE *fp;
block_sig_t *bs; block_sig_t *bs;
@ -121,7 +123,7 @@ showSigblkParams(char *name)
goto err; goto err;
} }
} }
if((r = rsgt_chkFileHdr(fp, "LOGSIG11")) != 0) goto err; if((r = rsgt_chkFileHdr(fp, (char*)"LOGSIG11")) != 0) goto err;
while(1) { /* we will err out on EOF */ while(1) { /* we will err out on EOF */
if((r = rsgt_getBlockParams(fp, 0, &bs, &bh, &bHasRecHashes, if((r = rsgt_getBlockParams(fp, 0, &bs, &bh, &bHasRecHashes,
@ -145,7 +147,7 @@ err:
} }
static void static void
convertFile(char *name) convertFile(const char *name)
{ {
FILE *oldsigfp = NULL, *newsigfp = NULL; FILE *oldsigfp = NULL, *newsigfp = NULL;
char hdr[9]; char hdr[9];
@ -239,7 +241,7 @@ err:
#ifdef ENABLEKSI #ifdef ENABLEKSI
static void static void
dumpFileKSI(char *name) dumpFileKSI(const char *name)
{ {
FILE *fp; FILE *fp;
char hdr[9]; char hdr[9];
@ -283,7 +285,7 @@ err: fprintf(stderr, "error %d (%s) processing file %s\n", r, RSKSIE2String(r),
} }
static void static void
showSigblkParamsKSI(char *name) showSigblkParamsKSI(const char *name)
{ {
FILE *fp; FILE *fp;
block_sig_t *bs; block_sig_t *bs;
@ -300,7 +302,7 @@ showSigblkParamsKSI(char *name)
goto err; goto err;
} }
} }
if((r = rsksi_chkFileHdr(fp, "LOGSIG11", verbose)) != 0) goto err; if((r = rsksi_chkFileHdr(fp, (char*)"LOGSIG11", verbose)) != 0) goto err;
while(1) { /* we will err out on EOF */ while(1) { /* we will err out on EOF */
if((r = rsksi_getBlockParams(fp, 0, &bs, &bh, &bHasRecHashes, if((r = rsksi_getBlockParams(fp, 0, &bs, &bh, &bHasRecHashes,
@ -324,7 +326,7 @@ err:
} }
static void static void
convertFileKSI(char *name) convertFileKSI(const char *name)
{ {
FILE *oldsigfp = NULL, *newsigfp = NULL; FILE *oldsigfp = NULL, *newsigfp = NULL;
char hdr[9]; char hdr[9];
@ -418,10 +420,10 @@ err:
#ifdef ENABLEGT #ifdef ENABLEGT
static void static void
detectFileType(char *name) detectFileType(const char *name)
{ {
FILE *fp; FILE *fp;
char *typeName; const char *typeName;
char hdr[9]; char hdr[9];
int r = -1; int r = -1;
@ -451,7 +453,7 @@ detectFileType(char *name)
err: fprintf(stderr, "error %d (%s) processing file %s\n", r, RSGTE2String(r), name); err: fprintf(stderr, "error %d (%s) processing file %s\n", r, RSGTE2String(r), name);
} }
static inline int static int
doVerifyRec(FILE *logfp, FILE *sigfp, FILE *nsigfp, doVerifyRec(FILE *logfp, FILE *sigfp, FILE *nsigfp,
gtfile gf, gterrctx_t *ectx, uint8_t bInBlock) gtfile gf, gterrctx_t *ectx, uint8_t bInBlock)
{ {
@ -493,7 +495,7 @@ done:
* note: here we need to have the LOG file name, not signature! * note: here we need to have the LOG file name, not signature!
*/ */
static int static int
verifyGT(char *name, char *errbuf, char *sigfname, char *oldsigfname, char *nsigfname, FILE *logfp, FILE *sigfp, FILE *nsigfp) verifyGT(const char *name, char *errbuf, char *sigfname, char *oldsigfname, char *nsigfname, FILE *logfp, FILE *sigfp, FILE *nsigfp)
{ {
block_sig_t *bs = NULL; block_sig_t *bs = NULL;
block_hdr_t *bh = NULL; block_hdr_t *bh = NULL;
@ -505,13 +507,13 @@ verifyGT(char *name, char *errbuf, char *sigfname, char *oldsigfname, char *nsig
gterrctx_t ectx; gterrctx_t ectx;
rsgt_errctxInit(&ectx); rsgt_errctxInit(&ectx);
rsgtInit("rsyslog rsgtutil " VERSION); rsgtInit((char*)"rsyslog rsgtutil " VERSION);
bInitDone = 1; bInitDone = 1;
ectx.verbose = verbose; ectx.verbose = verbose;
ectx.fp = stderr; ectx.fp = stderr;
ectx.filename = strdup(sigfname); ectx.filename = strdup(sigfname);
if((r = rsgt_chkFileHdr(sigfp, "LOGSIG11")) != 0) { if((r = rsgt_chkFileHdr(sigfp, (char*)"LOGSIG11")) != 0) {
if (debug) if (debug)
fprintf(stderr, "error %d in rsgt_chkFileHdr\n", r); fprintf(stderr, "error %d in rsgt_chkFileHdr\n", r);
goto done; goto done;
@ -658,10 +660,10 @@ err:
#ifdef ENABLEKSI #ifdef ENABLEKSI
static void static void
detectFileTypeKSI(char *name) detectFileTypeKSI(const char *name)
{ {
FILE *fp; FILE *fp;
char *typeName; const char *typeName;
char hdr[9]; char hdr[9];
int r = -1; int r = -1;
@ -691,7 +693,7 @@ detectFileTypeKSI(char *name)
err: fprintf(stderr, "error %d (%s) processing file %s\n", r, RSKSIE2String(r), name); err: fprintf(stderr, "error %d (%s) processing file %s\n", r, RSKSIE2String(r), name);
} }
static inline int static int
doVerifyRecKSI(FILE *logfp, FILE *sigfp, FILE *nsigfp, doVerifyRecKSI(FILE *logfp, FILE *sigfp, FILE *nsigfp,
ksifile ksi, ksierrctx_t *ectx, uint8_t bInBlock) ksifile ksi, ksierrctx_t *ectx, uint8_t bInBlock)
{ {
@ -733,7 +735,7 @@ done:
* note: here we need to have the LOG file name, not signature! * note: here we need to have the LOG file name, not signature!
*/ */
static int static int
verifyKSI(char *name, char *errbuf, char *sigfname, char *oldsigfname, char *nsigfname, FILE *logfp, FILE *sigfp, FILE *nsigfp) verifyKSI(const char *name, char *errbuf, char *sigfname, char *oldsigfname, char *nsigfname, FILE *logfp, FILE *sigfp, FILE *nsigfp)
{ {
filemode = FILEMODE_LOGSIG; /* Default FileMode */ filemode = FILEMODE_LOGSIG; /* Default FileMode */
block_sig_t *bs = NULL; block_sig_t *bs = NULL;
@ -755,7 +757,7 @@ verifyKSI(char *name, char *errbuf, char *sigfname, char *oldsigfname, char *nsi
/* Init KSI related variables */ /* Init KSI related variables */
rsksi_errctxInit(&ectx); rsksi_errctxInit(&ectx);
rsksiInit("rsyslog rsksiutil " VERSION); rsksiInit((char*)"rsyslog rsksiutil " VERSION);
bInitDone = 1; bInitDone = 1;
ectx.verbose = verbose; ectx.verbose = verbose;
ectx.fp = stderr; ectx.fp = stderr;
@ -768,7 +770,7 @@ verifyKSI(char *name, char *errbuf, char *sigfname, char *oldsigfname, char *nsi
} }
/* Check if we have a logsignature file */ /* Check if we have a logsignature file */
if((r = rsksi_chkFileHdr(sigfp, "LOGSIG11", 0)) == 0) { if((r = rsksi_chkFileHdr(sigfp, (char*)"LOGSIG11", 0)) == 0) {
/* Verify Log signature */ /* Verify Log signature */
if(debug) printf("debug: verifyKSI:\t\t\t Found log signature file ... \n"); if(debug) printf("debug: verifyKSI:\t\t\t Found log signature file ... \n");
if(mode == MD_EXTEND) { if(mode == MD_EXTEND) {
@ -817,7 +819,7 @@ verifyKSI(char *name, char *errbuf, char *sigfname, char *oldsigfname, char *nsi
bInBlock = 0; bInBlock = 0;
} else bInBlock = 1; } else bInBlock = 1;
} }
} else if((r = rsksi_chkFileHdr(sigfp, "RECSIG11", verbose)) == 0) { } else if((r = rsksi_chkFileHdr(sigfp, (char*)"RECSIG11", verbose)) == 0) {
/* Verify Log Excerpts */ /* Verify Log Excerpts */
if(debug) printf("verifyKSI:\t\t\t Found record integrity proof file ... \n"); if(debug) printf("verifyKSI:\t\t\t Found record integrity proof file ... \n");
filemode = FILEMODE_RECSIG; filemode = FILEMODE_RECSIG;
@ -1023,7 +1025,7 @@ err:
* Input: logfilename and open file handles * Input: logfilename and open file handles
*/ */
static int static int
extractKSI(char *name, char *errbuf, char *sigfname, FILE *logfp, FILE *sigfp) extractKSI(const char *name, char *errbuf, char *sigfname, FILE *logfp, FILE *sigfp)
{ {
char newsigfname[4096]; char newsigfname[4096];
FILE *newsigfp = NULL; FILE *newsigfp = NULL;
@ -1069,7 +1071,7 @@ extractKSI(char *name, char *errbuf, char *sigfname, FILE *logfp, FILE *sigfp)
/* Count number of linenumbers */ /* Count number of linenumbers */
if (strlen(linenumbers) > 0 ) { if (strlen(linenumbers) > 0 ) {
/* Get count of line numbers */ /* Get count of line numbers */
char* pszTmp = linenumbers; const char* pszTmp = linenumbers;
if (*(pszTmp) != ',') if (*(pszTmp) != ',')
iLineNumbers++; iLineNumbers++;
else else
@ -1099,7 +1101,7 @@ extractKSI(char *name, char *errbuf, char *sigfname, FILE *logfp, FILE *sigfp)
int iNumPos = 0; int iNumPos = 0;
int iNumLength = 0; int iNumLength = 0;
char szTmpNum[11]; char szTmpNum[11];
char* pszBegin = linenumbers; const char* pszBegin = linenumbers;
char* pszEnd; char* pszEnd;
while(pszBegin != NULL) { while(pszBegin != NULL) {
/* Cut number from string */ /* Cut number from string */
@ -1137,7 +1139,7 @@ extractKSI(char *name, char *errbuf, char *sigfname, FILE *logfp, FILE *sigfp)
/* Init KSI library */ /* Init KSI library */
ksierrctx_t ectx; ksierrctx_t ectx;
rsksi_errctxInit(&ectx); rsksi_errctxInit(&ectx);
rsksiInit("rsyslog rsksiutil " VERSION); rsksiInit((char*)"rsyslog rsksiutil " VERSION);
bInitDone = 1; bInitDone = 1;
/* Set defaults for KSI Signature extraction */ /* Set defaults for KSI Signature extraction */
ectx.verbose = verbose; ectx.verbose = verbose;
@ -1145,7 +1147,7 @@ extractKSI(char *name, char *errbuf, char *sigfname, FILE *logfp, FILE *sigfp)
ectx.filename = strdup(sigfname); ectx.filename = strdup(sigfname);
/* Check for valid file header in sigfile */ /* Check for valid file header in sigfile */
if((r = rsksi_chkFileHdr(sigfp, "LOGSIG11", verbose)) != 0) { if((r = rsksi_chkFileHdr(sigfp, (char*)"LOGSIG11", verbose)) != 0) {
if (debug) printf("debug: extractKSI:\t\t\t error %d in rsksi_chkFileHdr\n", r); if (debug) printf("debug: extractKSI:\t\t\t error %d in rsksi_chkFileHdr\n", r);
goto done; goto done;
} }
@ -1487,7 +1489,7 @@ done2:
/* VERIFY if logfile has a Guardtime Signfile /* VERIFY if logfile has a Guardtime Signfile
*/ */
static void static void
verify(char *name, char *errbuf) verify(const char *name, char *errbuf)
{ {
int iSuccess = 1; int iSuccess = 1;
char sigfname[4096]; char sigfname[4096];
@ -1592,7 +1594,7 @@ done:
/* EXTRACT loglines including their signatures from a logfile /* EXTRACT loglines including their signatures from a logfile
*/ */
static void static void
extract(char *name, char *errbuf) extract(const char *name, char *errbuf)
{ {
int iSuccess = 1; int iSuccess = 1;
char sigfname[4096]; char sigfname[4096];
@ -1667,7 +1669,7 @@ done:
} }
static void static void
processFile(char *name) processFile(const char *name)
{ {
char errbuf[4096]; char errbuf[4096];
@ -1734,6 +1736,9 @@ processFile(char *name)
fprintf(stdout, "ProcessMode: Extract"); fprintf(stdout, "ProcessMode: Extract");
extract(name, errbuf); extract(name, errbuf);
break; break;
default:fprintf(stderr, "%s:%d: program error, invalid switch value\n", __FILE__, __LINE__);
abort();
break;
} }
} }
@ -1763,7 +1768,7 @@ static struct option long_options[] =
}; };
/* Helper function to show some HELP */ /* Helper function to show some HELP */
void static void
rsgtutil_usage(void) rsgtutil_usage(void)
{ {
fprintf(stderr, "usage: rsgtutil [options]\n" fprintf(stderr, "usage: rsgtutil [options]\n"