- Modify the depend section of each Makefile.in to reference

[bacula/bacula] / bacula / src / gnome2-console / console_conf.c

diff --git a/bacula/src/gnome2-console/console_conf.c b/bacula/src/gnome2-console/console_conf.c
index e2c0da44b29a37bef8e4e99029bcd5b0bccde1c8..44f81a5c316f9b36f2a0f12759eb22a56e92a330 100644 (file)
--- a/bacula/src/gnome2-console/console_conf.c
+++ b/bacula/src/gnome2-console/console_conf.c
@@ -49,7 +49,7 @@
  */
 int r_first = R_FIRST;
 int r_last  = R_LAST;
-static RES *sres_head[R_LAST - R_FIRST];
+static RES *sres_head[R_LAST - R_FIRST + 1];
 RES **res_head = sres_head;
 
 /* Forward referenced subroutines */
@@ -99,10 +99,10 @@ static RES_ITEM con_font_items[] = {
  * It must have one item for each of the resources.
  */
 RES_TABLE resources[] = {
-   {"director",      dir_items,   R_DIRECTOR,  NULL},
-   {"console",       con_items,   R_CONSOLE,   NULL},
-   {"consolefont",   con_font_items, R_CONSOLE_FONT,   NULL},
-   {NULL,           NULL,        0,           NULL}
+   {"director",      dir_items,   R_DIRECTOR},
+   {"console",       con_items,   R_CONSOLE},
+   {"consolefont",   con_font_items, R_CONSOLE_FONT},
+   {NULL,           NULL,        0}
 };
 
 
@@ -267,12 +267,12 @@ void save_resource(int type, RES_ITEM *items, int pass)
    if (!error) {
       res = (URES *)malloc(size);
       memcpy(res, &res_all, size);
-      if (!resources[rindex].res_head) {
-        resources[rindex].res_head = (RES *)res; /* store first entry */
+      if (!res_head[rindex]) {
+        res_head[rindex] = (RES *)res; /* store first entry */
       } else {
         RES *next;
         /* Add new res to end of chain */
-        for (next=resources[rindex].res_head; next->next; next=next->next) {
+        for (next=res_head[rindex]; next->next; next=next->next) {
            if (strcmp(next->name, res->dir_res.hdr.name) == 0) {
               Emsg2(M_ERROR_TERM, 0,
                   _("Attempt to define second %s resource named \"%s\" is not permitted.\n"),