RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 10-May-2016 19:03:41 Branch: rpm-5_4 Handle: 2016051017034001 Modified files: (Branch: rpm-5_4) rpm/rpmio Makefile.am mongoc.c pcrs.c rpmgit.c rpmio.c rpmpgp.c ttpm.c Log: - reformat to avoid gcc-6.1.1 warnings. Summary: Revision Changes Path 1.293.2.68 +2 -2 rpm/rpmio/Makefile.am 1.1.2.14 +2 -0 rpm/rpmio/mongoc.c 1.1.2.7 +2 -0 rpm/rpmio/pcrs.c 2.1.2.56 +4 -4 rpm/rpmio/rpmgit.c 1.230.2.31 +3 -1 rpm/rpmio/rpmio.c 2.127.2.20 +2 -2 rpm/rpmio/rpmpgp.c 2.6.2.7 +2 -1 rpm/rpmio/ttpm.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am ============================================================================ $ cvs diff -u -r1.293.2.67 -r1.293.2.68 Makefile.am --- rpm/rpmio/Makefile.am 5 May 2016 22:27:47 -0000 1.293.2.67 +++ rpm/rpmio/Makefile.am 10 May 2016 17:03:40 -0000 1.293.2.68 @@ -5,7 +5,7 @@ LINT = splint MCCABE = pmccabe -SUBDIRS = # auto # tests +SUBDIRS = auto # tests CLEANFILES = *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda @@ -532,7 +532,7 @@ tget_LDADD = $(RPMIO_LDADD_COMMON) tgfs_SOURCES = tgfs.c -tgfs_LDADD = $(RPMIO_LDADD_COMMON) -lrt +tgfs_LDADD = $(RPMIO_LDADD_COMMON) tgit_SOURCES = tgit.c tgit_LDADD = $(RPMIO_LDADD_COMMON) @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/mongoc.c ============================================================================ $ cvs diff -u -r1.1.2.13 -r1.1.2.14 mongoc.c --- rpm/rpmio/mongoc.c 8 May 2016 18:47:26 -0000 1.1.2.13 +++ rpm/rpmio/mongoc.c 10 May 2016 17:03:40 -0000 1.1.2.14 @@ -14009,7 +14009,9 @@ } assert(data != NULL); /* XXX coverity 1357858 */ +#ifdef NOTYET /* tgfs put fails here */ assert(len > 0); /* XXX coverity 1357857 */ +#endif file->page = _mongoc_gridfs_file_page_new (data, len, file->chunk_size); /* seek in the page towards wherever we're supposed to be */ @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/pcrs.c ============================================================================ $ cvs diff -u -r1.1.2.6 -r1.1.2.7 pcrs.c --- rpm/rpmio/pcrs.c 6 Oct 2014 19:43:58 -0000 1.1.2.6 +++ rpm/rpmio/pcrs.c 10 May 2016 17:03:41 -0000 1.1.2.7 @@ -41,9 +41,11 @@ #define PCRS_H_VERSION "$Id: pcrs.h,v 1.11 2002/03/08 14:18:23 oes Exp $" +#ifdef DYING #if !defined(lint) && !defined(__clang__) static const char pcrs_h_rcs[] = PCRS_H_VERSION; #endif +#endif #define FALSE 0 #define TRUE 1 @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmgit.c ============================================================================ $ cvs diff -u -r2.1.2.55 -r2.1.2.56 rpmgit.c --- rpm/rpmio/rpmgit.c 27 Feb 2016 19:59:20 -0000 2.1.2.55 +++ rpm/rpmio/rpmgit.c 10 May 2016 17:03:41 -0000 2.1.2.56 @@ -1863,11 +1863,11 @@ xx = chkgit(git, "treeish_to_tree", treeish_to_tree(&t1, git->R, "HEAD")); - if (o.cache == CACHE_NONE) - xx = chkgit(git, "git_diff_tree_to_workdir", + if (o.cache == CACHE_NONE) + xx = chkgit(git, "git_diff_tree_to_workdir", git_diff_tree_to_workdir(&diff, git->R, t1, &o.diffopts)); - else - xx = chkgit(git, "git_diff_tree_to_index", + else + xx = chkgit(git, "git_diff_tree_to_index", git_diff_tree_to_index(&diff, git->R, t1, NULL, &o.diffopts)); } else if (t1) @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmio.c ============================================================================ $ cvs diff -u -r1.230.2.30 -r1.230.2.31 rpmio.c --- rpm/rpmio/rpmio.c 5 May 2016 22:20:56 -0000 1.230.2.30 +++ rpm/rpmio/rpmio.c 10 May 2016 17:03:41 -0000 1.230.2.31 @@ -321,7 +321,9 @@ assert(fd != NULL); fd->opath = _free(fd->opath); - if (fd->stats) free(fd->stats); fd->stats = NULL; + if (fd->stats) + free(fd->stats); + fd->stats = NULL; if (fd->ndigests > 0) for (i = fd->ndigests - 1; i >= 0; i--) { DIGEST_CTX ctx = fd->digests[i]; @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmpgp.c ============================================================================ $ cvs diff -u -r2.127.2.19 -r2.127.2.20 rpmpgp.c --- rpm/rpmio/rpmpgp.c 19 Apr 2016 13:03:10 -0000 2.127.2.19 +++ rpm/rpmio/rpmpgp.c 10 May 2016 17:03:41 -0000 2.127.2.20 @@ -1716,8 +1716,8 @@ /* Add additional bytes necessary for eol string(s). */ if (b64encode_chars_per_line > 0 && b64encode_eolstr != NULL) { lc = (nt + b64encode_chars_per_line - 1) / b64encode_chars_per_line; - if (((nt + b64encode_chars_per_line - 1) % b64encode_chars_per_line) != 0) - ++lc; + if (((nt + b64encode_chars_per_line - 1) % b64encode_chars_per_line) != 0) + ++lc; nt += lc * strlen(b64encode_eolstr); } /*@=globs@*/ @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/ttpm.c ============================================================================ $ cvs diff -u -r2.6.2.6 -r2.6.2.7 ttpm.c --- rpm/rpmio/ttpm.c 19 Apr 2016 13:08:27 -0000 2.6.2.6 +++ rpm/rpmio/ttpm.c 10 May 2016 17:03:41 -0000 2.6.2.7 @@ -2076,7 +2076,8 @@ if (!strcmp(av[0], "dirread")) { unsigned char data[TPM_HASH_SIZE]; -if (ix < 1) ix = 0; /* XXX FIXME */ + if (ix < 1) + ix = 0; /* XXX FIXME */ ec = rpmtpmErr(tpm, "DirRead", 0, TPM_DirRead(ix, data)); if (ec) @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org