From 6d89ca534e2138511ecb76c02bcec1bcb83f685b Mon Sep 17 00:00:00 2001 From: Igor Kozhukhov Date: Fri, 14 Nov 2014 14:28:19 +0400 Subject: [PATCH] 5334 cleanup gcc warning for cmd/savecore Reviewed by: Keith Wesolowski Approved by: Dan McDonald --- usr/src/cmd/savecore/Makefile.com | 1 - usr/src/cmd/savecore/savecore.c | 8 ++++---- usr/src/common/bzip2/compress.c | 3 ++- usr/src/uts/common/os/compress.c | 7 +++---- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/usr/src/cmd/savecore/Makefile.com b/usr/src/cmd/savecore/Makefile.com index 2a9e06a0d7..591f33395b 100644 --- a/usr/src/cmd/savecore/Makefile.com +++ b/usr/src/cmd/savecore/Makefile.com @@ -32,7 +32,6 @@ C99MODE = $(C99_ENABLE) CFLAGS += $(CCVERBOSE) CFLAGS64 += $(CCVERBOSE) -CERRWARN += -_gcc=-Wno-uninitialized CPPFLAGS += -D_LARGEFILE64_SOURCE=1 -DBZ_NO_STDIO -I$(SRC)/uts/common # diff --git a/usr/src/cmd/savecore/savecore.c b/usr/src/cmd/savecore/savecore.c index 2bd0517055..746c528347 100644 --- a/usr/src/cmd/savecore/savecore.c +++ b/usr/src/cmd/savecore/savecore.c @@ -456,8 +456,8 @@ build_dump_map(int corefd, const pfn_t *pfn_table) for (i = 0; i < corehdr.dump_nvtop; i++) { long first = 0; long last = corehdr.dump_npages - 1; - long middle; - pfn_t pfn; + long middle = 0; + pfn_t pfn = 0; uintptr_t h; Fread(&vtop, sizeof (mem_vtop_t), in); @@ -1183,7 +1183,7 @@ decompress_pages(int corefd) char *cpage = NULL; char *dpage = NULL; char *out; - pgcnt_t curpage; + pgcnt_t curpage = 0; block_t *b; FILE *dumpf; FILE *tracef = NULL; @@ -1195,7 +1195,7 @@ decompress_pages(int corefd) dumpcsize_t dcsize; int nstreams = datahdr.dump_nstreams; int maxcsize = datahdr.dump_maxcsize; - int nout, tag, doflush; + int nout = 0, tag, doflush; dumpf = fdopen(dup(dumpfd), "rb"); if (dumpf == NULL) diff --git a/usr/src/common/bzip2/compress.c b/usr/src/common/bzip2/compress.c index caf7696011..15b5fd6904 100644 --- a/usr/src/common/bzip2/compress.c +++ b/usr/src/common/bzip2/compress.c @@ -26,6 +26,7 @@ so as to do a bit better on small files */ +#include #include "bzlib_private.h" @@ -240,7 +241,7 @@ void sendMTFValues ( EState* s ) { Int32 v, t, i, j, gs, ge, totc, bt, bc, iter; Int32 nSelectors, alphaSize, minLen, maxLen, selCtr; - Int32 nGroups, nBytes; + Int32 nGroups, __GNU_UNUSED nBytes; /*-- UChar len [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE]; diff --git a/usr/src/uts/common/os/compress.c b/usr/src/uts/common/os/compress.c index 634bf89ade..d65f977ab2 100644 --- a/usr/src/uts/common/os/compress.c +++ b/usr/src/uts/common/os/compress.c @@ -24,8 +24,6 @@ * All rights reserved. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * NOTE: this file is compiled into the kernel, cprboot, and savecore. * Therefore it must compile in kernel, boot, and userland source context; @@ -118,6 +116,7 @@ */ #include +#include #define MATCH_BITS 6 #define MATCH_MIN 3 @@ -130,7 +129,7 @@ compress(void *s_start, void *d_start, size_t s_len) { uchar_t *src = s_start; uchar_t *dst = d_start; - uchar_t *cpy, *copymap; + uchar_t *cpy, *copymap = NULL; int copymask = 1 << (NBBY - 1); int mlen, offset; uint16_t *hp; @@ -181,7 +180,7 @@ decompress(void *s_start, void *d_start, size_t s_len, size_t d_len) uchar_t *dst = d_start; uchar_t *s_end = (uchar_t *)s_start + s_len; uchar_t *d_end = (uchar_t *)d_start + d_len; - uchar_t *cpy, copymap; + uchar_t *cpy, copymap = '\0'; int copymask = 1 << (NBBY - 1); if (s_len >= d_len) { -- 2.11.4.GIT