From bffa5e9187d3655b3e3a8875fe69788d1c6c74a6 Mon Sep 17 00:00:00 2001 From: Tomas Mlcoch Date: Tue, 10 Jan 2012 09:27:07 +0100 Subject: [PATCH] misc-string_to_version - Instead of empty string use NULL. --- misc.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/misc.c b/misc.c index 7fb88a3..78ea27f 100644 --- a/misc.c +++ b/misc.c @@ -37,12 +37,6 @@ struct VersionStruct string_to_version(const char *string) ver.release = NULL; if (!string || !(strlen(string))) { - ver.epoch = malloc(sizeof(char)); - ver.version = malloc(sizeof(char)); - ver.release = malloc(sizeof(char)); - ver.epoch[0] = '\0'; - ver.version[0] = '\0'; - ver.release[0] = '\0'; return ver; } @@ -60,11 +54,11 @@ struct VersionStruct string_to_version(const char *string) ver.epoch = malloc(sizeof(char) * (len + 1)); strncpy(ver.epoch, string, len); ver.epoch[len] = '\0'; - } else { // epoch is not a number - ver.epoch = NULL; - } + } //else { // epoch is not a number + //ver.epoch = NULL; + //} } else { - ver.epoch = NULL; + //ver.epoch = NULL; ptr = string-1; } @@ -82,18 +76,17 @@ struct VersionStruct string_to_version(const char *string) strcpy(ver.version, ptr+1); } - // Malloc empty strings instead of NULL if (!ver.epoch) { ver.epoch = malloc(sizeof(char) * 2); ver.epoch[0] = '0'; ver.epoch[1] = '\0'; - } else if (!ver.version) { - ver.version = malloc(sizeof(char)); - ver.version[0] = '\0'; - } else if (!ver.release) { - ver.release = malloc(sizeof(char)); - ver.release[0] = '\0'; - } + } //else if (!ver.version) { +// ver.version = malloc(sizeof(char)); +// ver.version[0] = '\0'; +// } else if (!ver.release) { +// ver.release = malloc(sizeof(char)); +// ver.release[0] = '\0'; +// } return ver; } -- 2.7.4