RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   16-Aug-2008 19:16:11
  Branch: rpm-5_1                          Handle: 2008081617161001

  Modified files:           (Branch: rpm-5_1)
    rpm                     CHANGES
    rpm/tools               db_tool.c

  Log:
    - jbj: db_tool: remove gcc whinings

  Summary:
    Revision    Changes     Path
    1.2288.2.78 +1  -0      rpm/CHANGES
    2.2.4.1     +4  -3      rpm/tools/db_tool.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2288.2.77 -r1.2288.2.78 CHANGES
  --- rpm/CHANGES	16 Aug 2008 17:05:36 -0000	1.2288.2.77
  +++ rpm/CHANGES	16 Aug 2008 17:16:10 -0000	1.2288.2.78
  @@ -1,4 +1,5 @@
   5.1.4 -> 5.1.5:
  +    - jbj: db_tool: remove gcc whinings.
       - jbj: include misc/asprintf.h for use by rpmmtree on QNX.
       - jbj: move glob/fnmatch into -lrpmio from -lrpmmisc.
       - jbj: lua: don't exit chroot if already within running script.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tools/db_tool.c
  ============================================================================
  $ cvs diff -u -r2.2 -r2.2.4.1 db_tool.c
  --- rpm/tools/db_tool.c	29 Jul 2007 18:35:33 -0000	2.2
  +++ rpm/tools/db_tool.c	16 Aug 2008 17:16:11 -0000	2.2.4.1
  @@ -200,12 +200,13 @@
   int main(int argc, char *argv[])
   {
       int i, j, k, l;
  +    int nitems = (int)sizeof(main_dispatch)/sizeof(main_dispatch[0]);
       char *arg;
   
       /* 1. try to dispatch over program name ("db_load [...]") */
       arg = argv[0];
       l = strlen(arg);
  -    for (i = 0; i < sizeof(main_dispatch)/sizeof(main_dispatch[0]); i++) {
  +    for (i = 0; i < nitems; i++) {
           k = strlen(main_dispatch[i].name);
           if (   strcmp(arg, main_dispatch[i].name) == 0
               || (l > k && arg[l-k-1] == '/' && strcmp(arg+l-k, main_dispatch[i].name) == 0)) {
  @@ -218,7 +219,7 @@
       if (argc >= 2) {
           arg = argv[1];
           l = strlen(arg);
  -        for (i = 0; i < sizeof(main_dispatch)/sizeof(main_dispatch[0]); i++) {
  +        for (i = 0; i < nitems; i++) {
               k = strlen(main_dispatch[i].name);
               if (   strcmp(argv[1], main_dispatch[i].name) == 0
                   || (l == k-3 && strcmp(arg, main_dispatch[i].name+3) == 0)) {
  @@ -237,7 +238,7 @@
       fprintf(stderr, "db_tool:USAGE: db_tool db_<command> <options>\n");
       fprintf(stderr, "db_tool:USAGE: db_tool <command> <options>\n");
       fprintf(stderr, "db_tool:HINT: <command> is one of:");
  -    for (i = 0; i < sizeof(main_dispatch)/sizeof(main_dispatch[0]); i++)
  +    for (i = 0; i < nitems; i++)
           fprintf(stderr, " %s", main_dispatch[i].name+3);
       fprintf(stderr, "\n");
       return 1;
  @@ .