2009-02-23 Chris Allegretta <chrisa@asty.org>

	* rcfile.c (parse_keybinding) - Define a var before tryung to use it.  Whoops!
	* fix some redefinitions causing compiler warnings, from Eitan Adler.  Other
	  (hopefully) fixes for uncasted malloc()s, reported by the same.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4385 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index b161ceb05e39cd87effffd63db5fc88ee9dd9268..b1b9b2045841ea9560e2abe7e649336c2af8e392 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-23 Chris Allegretta <chrisa@asty.org>
+       * rcfile.c (parse_keybinding) - Define a var before tryung to use it.  Whoops!
+       * fix some redefinitions causing compiler warnings, from Eitan Adler.  Other
+         (hopefully) fixes for uncasted malloc()s, reported by the same.
 
 GNU nano 2.1.9 - 2009.02.16
 2009-02-16 Chris Allegretta <chrisa@asty.org>

diff --git a/src/global.c b/src/global.c
index 54b337d688a480c88b0fee83cd88d5152132a40f..1816b52cda50e662d6bbdbfdf8aa9977d121ad8a 100644 (file)
--- a/src/global.c
+++ b/src/global.c
@@ -232,7 +232,7 @@ void add_to_funcs(short func, int menus, const char *desc, const char *help,
     subnfunc *f;
 
     if (allfuncs == NULL) {
-       allfuncs = nmalloc(sizeof(subnfunc));
+       allfuncs = (subnfunc *) nmalloc(sizeof(subnfunc));
        f = allfuncs;
     } else {
        for (f = allfuncs; f->next != NULL; f = f->next)
@@ -292,7 +292,7 @@ void add_to_sclist(int menu, char *scstring, short func, int toggle, int execute
     sc *s;
 
     if (sclist == NULL) {
-       sclist = nmalloc(sizeof(sc));
+       sclist = (sc *) nmalloc(sizeof(sc));
        s = sclist;
         s->next = NULL;
     } else {

diff --git a/src/proto.h b/src/proto.h
index e29055fbe03da8ecaece9886110d1ec511042e26..ba59e51e5f8f1aca4fc889370ac28d4160bb3652 100644 (file)
--- a/src/proto.h
+++ b/src/proto.h
@@ -76,7 +76,7 @@ extern char *quoteerr;
 extern size_t quotelen;
 #endif
 #endif
-bool nodelay_mode;
+extern bool nodelay_mode;
 extern char *answer;
 
 extern ssize_t tabsize;
@@ -811,11 +811,6 @@ const char *mac_format_msg;
 const char *append_msg;
 const char *prepend_msg;
 const char *backup_file_msg;
-const char *dos_format_msg;
-const char *mac_format_msg;
-const char *append_msg;
-const char *prepend_msg;
-const char *backup_file_msg;
 const char *gototext_msg;
 const char *new_buffer_msg;
 void iso_me_harder_funcmap(short func);

diff --git a/src/rcfile.c b/src/rcfile.c
index 4704e85e71f8df1fbd667d6410a0a52c0b82969b..6c5916a8e582ef899cac99be32f2f01269290d42 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -416,6 +416,7 @@ void parse_keybinding(char *ptr)
        return;
     }
 
+    menu = strtomenu(menuptr);
     newsc = strtosc(menu, funcptr);
     if (newsc == NULL) {
        rcfile_error(
@@ -423,7 +424,6 @@ void parse_keybinding(char *ptr)
        return;
     }
 
-    menu = strtomenu(menuptr);
     if (menu < 1) {
        rcfile_error(
                N_("Could not map name \"%s\" to a menu"), menuptr);