fix gcc warning
authorMichael Andres <ma@suse.de>
Tue, 22 May 2007 21:10:45 +0000 (21:10 +0000)
committerMichael Andres <ma@suse.de>
Tue, 22 May 2007 21:10:45 +0000 (21:10 +0000)
zypp/target/hal/Hal.cc
zypp/target/modalias/Modalias.cc

index 712ceae..1cc4a4c 100644 (file)
@@ -11,6 +11,7 @@
 */
 #include <iostream>
 
+#undef ZYPP_BASE_LOGGER_LOGGROUP
 #define ZYPP_BASE_LOGGER_LOGGROUP "HAL"
 #include "zypp/base/Logger.h"
 
index 4c49969..4008593 100644 (file)
@@ -11,6 +11,7 @@
 */
 #include <iostream>
 
+#undef ZYPP_BASE_LOGGER_LOGGROUP
 #define ZYPP_BASE_LOGGER_LOGGROUP "MODALIAS"
 #include "zypp/base/Logger.h"
 
@@ -106,14 +107,14 @@ iterate_devices(const char *dir, const char *file, void *arg)
                goto out;
        }
        if ((entry->modalias = strdup(modalias)) == NULL) {
-               free(entry);        
+               free(entry);
                ret = -1;
                goto out;
        }
        entry->next = *list;
        *list = entry;
        XXX << "system modalias: " << entry->modalias << endl;
-       
+
 out:
        (void) close(fd);
        return 0;