discover: Initialise strtok_r saveptr to NULL

Signed-off-by: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

diff --git a/discover/boot.c b/discover/boot.c
index 6e7fda6559caaa873dd99520d5e1cd68398b89bb..7778b3fd02bc21f588e260e08cb888d20b4a266a 100644 (file)
--- a/discover/boot.c
+++ b/discover/boot.c
@@ -177,7 +177,7 @@ static void boot_hook_update(struct boot_task *task, const char *hookname,
                char *buf)
 {
        char *line, *name, *val, *sep;
                char *buf)
 {
        char *line, *name, *val, *sep;

-       char *saveptr;
+       char *saveptr = NULL;

 
        for (;; buf = NULL) {
 
 
        for (;; buf = NULL) {
 

diff --git a/discover/grub2/env.c b/discover/grub2/env.c
index 9de5e9f95d819df9170f8031a870a5dceb0ca0df..1336824d1d92fb2bbc9d16945b4d3330135db6e1 100644 (file)
--- a/discover/grub2/env.c
+++ b/discover/grub2/env.c
@@ -17,7 +17,7 @@ static const char *signature = "# GRUB Environment Block\n";
 
 static int parse_buf_to_env(struct grub2_script *script, void *buf, int len)
 {
 
 static int parse_buf_to_env(struct grub2_script *script, void *buf, int len)
 {

-       char *tmp, *line, *sep;
+       char *tmp = NULL, *line, *sep;

        int siglen;
 
        siglen = strlen(signature);
        int siglen;
 
        siglen = strlen(signature);

diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c
index 395f1349312e8deeeea240eecfa876515d0c16f1..a293ce9dd5506a0c03d000e0c1ba55d8d8e2ff51 100644 (file)
--- a/discover/platform-powerpc.c
+++ b/discover/platform-powerpc.c
@@ -337,7 +337,7 @@ out_err:
 static int parse_one_dns_config(struct config *config,
                char *confstr)
 {
 static int parse_one_dns_config(struct config *config,
                char *confstr)
 {

-       char *tok, *saveptr;
+       char *tok, *saveptr = NULL;

 
        for (tok = strtok_r(confstr, ",", &saveptr); tok;
                        tok = strtok_r(NULL, ",", &saveptr)) {
 
        for (tok = strtok_r(confstr, ",", &saveptr); tok;
                        tok = strtok_r(NULL, ",", &saveptr)) {