poldek: poldek/lib_init.c, poldek/pkgset.c, poldek/log.c, poldek/l...

[mis]

Author: mis                          Date: Mon Jul  9 17:06:31 2007 GMT
Module: poldek                        Tag: HEAD
---- Log message:
- const poldek_VERBOSE

---- Files affected:
poldek/poldek:
   lib_init.c (1.86 -> 1.87) , pkgset.c (1.97 -> 1.98) , log.c (1.34 -> 1.35) , log.h (1.27 -> 1.28) 

---- Diffs:

================================================================
Index: poldek/poldek/lib_init.c
diff -u poldek/poldek/lib_init.c:1.86 poldek/poldek/lib_init.c:1.87
--- poldek/poldek/lib_init.c:1.86	Sun Jul  8 17:27:11 2007
+++ poldek/poldek/lib_init.c	Mon Jul  9 19:06:25 2007
@@ -802,9 +802,6 @@
         }
     }
     
-    if (ts->getop(ts, POLDEK_OP_CONFIRM_INST) && poldek_VERBOSE < 1)
-        poldek_VERBOSE = 1;
-    
     if (ts->getop(ts, POLDEK_OP_GREEDY)) {
         int v = poldek_conf_get_bool(htcnf, "aggressive greedy", 1);
         poldek_ts_xsetop(ts, POLDEK_OP_AGGREEDY, v, 0);
@@ -863,7 +860,7 @@
     }
     
     if (ts->getop(ts, POLDEK_OP_CONFIRM_INST) && poldek_VERBOSE < 1)
-        poldek_VERBOSE = 1;
+        poldek_set_verbose(1);
     
     if (ts->getop(ts, POLDEK_OP_GREEDY))
         ts->setop(ts, POLDEK_OP_FOLLOW, 1);

================================================================
Index: poldek/poldek/pkgset.c
diff -u poldek/poldek/pkgset.c:1.97 poldek/poldek/pkgset.c:1.98
--- poldek/poldek/pkgset.c:1.97	Fri Jul  6 13:33:14 2007
+++ poldek/poldek/pkgset.c	Mon Jul  9 19:06:25 2007
@@ -284,10 +284,10 @@
     MEMINF("before index");
     pkgset_index(ps);
     MEMINF("after index");
-    v = poldek_VERBOSE;
-    poldek_VERBOSE = -1;
+    
+    v = poldek_set_verbose(-1);
     file_index_find_conflicts(ps->file_idx, strict);
-    poldek_VERBOSE = v;
+    poldek_set_verbose(v);
  
     pkgset_verify_deps(ps, strict);
     MEMINF("after verify deps");

================================================================
Index: poldek/poldek/log.c
diff -u poldek/poldek/log.c:1.34 poldek/poldek/log.c:1.35
--- poldek/poldek/log.c:1.34	Sun Jul  8 18:31:12 2007
+++ poldek/poldek/log.c	Mon Jul  9 19:06:25 2007
@@ -30,7 +30,7 @@
 #define POLDEK_LOG_H_INTERNAL
 #include "log.h"
 
-int  poldek_VERBOSE = 0;
+int poldek_VERBOSE = 0;
 int poldek_TRACE = -1;
 
 static int default_say_goodbye(const char *msg);
@@ -124,7 +124,7 @@
 
     if ((p = getenv("POLDEK_TRACE")) && *p && *p != '0')
         poldek_TRACE = 1;
-        
+
     return vv;
 }
 

================================================================
Index: poldek/poldek/log.h
diff -u poldek/poldek/log.h:1.27 poldek/poldek/log.h:1.28
--- poldek/poldek/log.h:1.27	Sun Jul  8 18:31:12 2007
+++ poldek/poldek/log.h	Mon Jul  9 19:06:25 2007
@@ -31,8 +31,13 @@
 
 int poldek_verbose(void);
 int poldek_set_verbose(int v);
+#ifdef POLDEK_LOG_H_INTERNAL
 extern int poldek_VERBOSE;
 extern int poldek_TRACE;
+#else
+extern const int poldek_VERBOSE;
+extern const int poldek_TRACE;
+#endif
 
 typedef void (*poldek_vlog_fn)(void *, int pri, const char *fmt, va_list args);
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/poldek/poldek/lib_init.c?r1=1.86&r2=1.87&f=u
    http://cvs.pld-linux.org/poldek/poldek/pkgset.c?r1=1.97&r2=1.98&f=u
    http://cvs.pld-linux.org/poldek/poldek/log.c?r1=1.34&r2=1.35&f=u
    http://cvs.pld-linux.org/poldek/poldek/log.h?r1=1.27&r2=1.28&f=u