diff options
| -rw-r--r-- | blkiomon.c | 2 | ||||
| -rw-r--r-- | btreplay/btreplay.c | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -198,7 +198,7 @@ static struct dstat *blkiomon_find_dstat(struct rb_search *search, __u32 device) static struct dstat *blkiomon_get_dstat(__u32 device) { struct dstat *dstat; - struct rb_search search; + struct rb_search search = { 0, }; pthread_mutex_lock(&dstat_mutex); diff --git a/btreplay/btreplay.c b/btreplay/btreplay.c index f762279..2a1e1cc 100644 --- a/btreplay/btreplay.c +++ b/btreplay/btreplay.c @@ -646,7 +646,7 @@ static void find_input_devs(char *idir) static void read_map_devs(char *file_name) { FILE *fp; - char *from_dev, *to_dev; + char from_dev[256], to_dev[256]; fp = fopen(file_name, "r"); if (!fp) { @@ -654,7 +654,7 @@ static void read_map_devs(char *file_name) /*NOTREACHED*/ } - while (fscanf(fp, "%as %as", &from_dev, &to_dev) == 2) { + while (fscanf(fp, "%s %s", from_dev, to_dev) == 2) { struct map_dev *mdp = malloc(sizeof(*mdp)); mdp->from_dev = from_dev; |