ncurses 5.9 - patch 20120825

[ncurses.git] / ncurses / tinfo / db_iterator.c

diff --git a/ncurses/tinfo/db_iterator.c b/ncurses/tinfo/db_iterator.c
index 943104c5dc0f6e6c0d10baf4fd67b260e3dbd8d5..67467d4251a99552ce9b8889117361d44318826d 100644 (file)
--- a/ncurses/tinfo/db_iterator.c
+++ b/ncurses/tinfo/db_iterator.c
@@ -43,7 +43,7 @@
 #include <hashed_db.h>
 #endif
 
 #include <hashed_db.h>
 #endif
 

-MODULE_ID("$Id: db_iterator.c,v 1.33 2012/06/23 00:16:58 tom Exp $")
+MODULE_ID("$Id: db_iterator.c,v 1.34 2012/06/30 16:30:10 tom Exp $")

 
 #define HaveTicDirectory _nc_globals.have_tic_directory
 #define KeepTicDirectory _nc_globals.keep_tic_directory
 
 #define HaveTicDirectory _nc_globals.have_tic_directory
 #define KeepTicDirectory _nc_globals.keep_tic_directory


@@ -98,7 +98,7 @@ update_getenv(const char *name, DBDIRS which)
     bool result = FALSE;
 
     if (which < dbdLAST) {
     bool result = FALSE;
 
     if (which < dbdLAST) {

-       char *value = getenv(name);
+       char *value;

 
        if ((value = getenv(name)) == 0 || (value = strdup(value)) == 0) {
            ;
 
        if ((value = getenv(name)) == 0 || (value = strdup(value)) == 0) {
            ;


@@ -402,7 +402,7 @@ _nc_db_iterator_leaks(void)
        FreeAndNull(my_blob);
     if (my_list != 0)
        FreeAndNull(my_list);
        FreeAndNull(my_blob);
     if (my_list != 0)
        FreeAndNull(my_list);

-    for (which = 0; which < dbdLAST; ++which) {
+    for (which = 0; (int) which < dbdLAST; ++which) {

        my_vars[which].name = 0;
        FreeIfNeeded(my_vars[which].value);
        my_vars[which].value = 0;
        my_vars[which].name = 0;
        FreeIfNeeded(my_vars[which].value);
        my_vars[which].value = 0;