Synchronise with v3.19

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

diff --git a/.version b/.version
index cb7161d7de3d962169cae6ed27a38f360d122be7..718a74e483e05af2ee584ed062070a15c8353887 100644 (file)
--- a/.version
+++ b/.version
@@ -1,2 +1,2 @@
-3.18.0 b2776bf7149bddd1f4161f14f79520f17fc1d71d Diseased Newt
+3.19.0 bfa76d49576599a4b9f9b7a71f23d73d6dcff735 Diseased Newt

 0
 0

diff --git a/frontends/mconf/mconf.c b/frontends/mconf/mconf.c
index 14cea7463a621b33c6c0b8487781db107d764841..4dd37552abc2cb5c4ba4afd6b3a70c6c3dfebdfe 100644 (file)
--- a/frontends/mconf/mconf.c
+++ b/frontends/mconf/mconf.c
@@ -330,10 +330,10 @@ static void set_subtitle(void)
        list_for_each_entry(sp, &trail, entries) {
                if (sp->text) {
                        if (pos) {
        list_for_each_entry(sp, &trail, entries) {
                if (sp->text) {
                        if (pos) {

-                               pos->next = xcalloc(sizeof(*pos), 1);
+                               pos->next = xcalloc(1, sizeof(*pos));

                                pos = pos->next;
                        } else {
                                pos = pos->next;
                        } else {

-                               subtitles = pos = xcalloc(sizeof(*pos), 1);
+                               subtitles = pos = xcalloc(1, sizeof(*pos));

                        }
                        pos->text = sp->text;
                }
                        }
                        pos->text = sp->text;
                }

diff --git a/libs/parser/list.h b/libs/parser/list.h
index 685d80e1bb0e77de75a97a2ada22991131597b58..2cf23f002d3f48f6b51ac9898fde7681ea39cf53 100644 (file)
--- a/libs/parser/list.h
+++ b/libs/parser/list.h
@@ -34,7 +34,7 @@ struct list_head {
  * list_entry - get the struct for this entry
  * @ptr:       the &struct list_head pointer.
  * @type:      the type of the struct this is embedded in.
  * list_entry - get the struct for this entry
  * @ptr:       the &struct list_head pointer.
  * @type:      the type of the struct this is embedded in.

- * @member:    the name of the list_struct within the struct.
+ * @member:    the name of the list_head within the struct.

  */
 #define list_entry(ptr, type, member) \
        container_of(ptr, type, member)
  */
 #define list_entry(ptr, type, member) \
        container_of(ptr, type, member)


@@ -43,7 +43,7 @@ struct list_head {
  * list_for_each_entry -       iterate over list of given type
  * @pos:       the type * to use as a loop cursor.
  * @head:      the head for your list.
  * list_for_each_entry -       iterate over list of given type
  * @pos:       the type * to use as a loop cursor.
  * @head:      the head for your list.

- * @member:    the name of the list_struct within the struct.
+ * @member:    the name of the list_head within the struct.

  */
 #define list_for_each_entry(pos, head, member)                         \
        for (pos = list_entry((head)->next, typeof(*pos), member);      \
  */
 #define list_for_each_entry(pos, head, member)                         \
        for (pos = list_entry((head)->next, typeof(*pos), member);      \


@@ -55,7 +55,7 @@ struct list_head {
  * @pos:       the type * to use as a loop cursor.
  * @n:         another type * to use as temporary storage
  * @head:      the head for your list.
  * @pos:       the type * to use as a loop cursor.
  * @n:         another type * to use as temporary storage
  * @head:      the head for your list.

- * @member:    the name of the list_struct within the struct.
+ * @member:    the name of the list_head within the struct.

  */
 #define list_for_each_entry_safe(pos, n, head, member)                 \
        for (pos = list_entry((head)->next, typeof(*pos), member),      \
  */
 #define list_for_each_entry_safe(pos, n, head, member)                 \
        for (pos = list_entry((head)->next, typeof(*pos), member),      \

diff --git a/libs/parser/menu.c b/libs/parser/menu.c
index a26cc5d2a9b0217d9c3d52bf0dab21b7337e95d2..72c9dba84c5dbd46cb8ae2824a85d54603dbaafe 100644 (file)
--- a/libs/parser/menu.c
+++ b/libs/parser/menu.c
@@ -548,7 +548,7 @@ static void get_prompt_str(struct gstr *r, struct property *prop,
 {
        int i, j;
        struct menu *submenu[8], *menu, *location = NULL;
 {
        int i, j;
        struct menu *submenu[8], *menu, *location = NULL;

-       struct jump_key *jump;
+       struct jump_key *jump = NULL;

 
        str_printf(r, _("Prompt: %s\n"), _(prop->text));
        menu = prop->menu->parent;
 
        str_printf(r, _("Prompt: %s\n"), _(prop->text));
        menu = prop->menu->parent;


@@ -586,7 +586,7 @@ static void get_prompt_str(struct gstr *r, struct property *prop,
                str_printf(r, _("  Location:\n"));
                for (j = 4; --i >= 0; j += 2) {
                        menu = submenu[i];
                str_printf(r, _("  Location:\n"));
                for (j = 4; --i >= 0; j += 2) {
                        menu = submenu[i];

-                       if (head && location && menu == location)
+                       if (jump && menu == location)

                                jump->offset = strlen(r->s);
                        str_printf(r, "%*c-> %s", j, ' ',
                                   _(menu_get_prompt(menu)));
                                jump->offset = strlen(r->s);
                        str_printf(r, "%*c-> %s", j, ' ',
                                   _(menu_get_prompt(menu)));

diff --git a/scripts/ksync.log b/scripts/ksync.log
index ea08e51d454f1e694b9c68c5669f2dae822af15f..e411e954f50437c9574acdccdc26ae7f51b4daf4 100644 (file)
--- a/scripts/ksync.log
+++ b/scripts/ksync.log
@@ -95,3 +95,6 @@ e062781 kconfig: do not allow more than one symbol to have 'option modules'
 7eb6e34 kbuild: trivial - remove trailing empty lines
 bb66fc6 kbuild: trivial - use tabs for code indent where possible
 c40724d kconfig: lxdialog: fix spelling
 7eb6e34 kbuild: trivial - remove trailing empty lines
 bb66fc6 kbuild: trivial - use tabs for code indent where possible
 c40724d kconfig: lxdialog: fix spelling

+3943f42 Replace mentions of "list_struct" to "list_head"
+2d56030 kconfig: Fix warning "‘jump’ may be used uninitialized"
+e4e458b calloc/xcalloc: Fix argument order