[pkg-fso-commits] [SCM] Automatic Display Manager branch, master, updated. debian/0.8-1-1-g59711ec

[Enrico Zini]

The following commit has been merged in the master branch:
commit 59711ece56899b05c89f1dc9b31bcce12d9aa0f8
Author: Enrico Zini <enrico at nodm.enricozini.org>
Date:   Fri Jul 8 16:38:19 2011 +0100

    Fixed a bogus compiler warning with older gccs

diff --git a/dm.c b/dm.c
index 831fbfb..03b1c35 100644
--- a/dm.c
+++ b/dm.c
@@ -229,6 +229,7 @@ cleanup:
 int nodm_display_manager_parse_xcmdline(struct nodm_display_manager* s, const char* xcmdline)
 {
     int return_code = E_SUCCESS;
+    char **argv = NULL;
 
     // tokenize xoptions
     wordexp_t* toks = (wordexp_t*)calloc(1, sizeof(wordexp_t));
@@ -248,7 +249,7 @@ int nodm_display_manager_parse_xcmdline(struct nodm_display_manager* s, const ch
     unsigned argc = 0;
     // +1 for the X server pathname, +1 for the display name,
     // +1 for the VT number, +1 for the trailing NULL
-    char **argv = (char**)malloc((toks->we_wordc + 4) * sizeof(char*));
+    argv =(char**)malloc((toks->we_wordc + 4) * sizeof(char*));
     if (argv == NULL)
     {
         return_code = E_OS_ERROR;

-- 
Automatic Display Manager