diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-06-18 04:53:12 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-06-18 04:53:19 -0400 |
commit | 646b1db4956ba8bf748b835b5eba211133d91c2e (patch) | |
tree | 061166d873d9da9cf83044a7593ad111787076c5 /scripts/kconfig/util.c | |
parent | 0f2c3de2ba110626515234d5d584fb1b0c0749a2 (diff) | |
parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) |
Merge commit 'v2.6.35-rc3' into perf/core
Merge reason: Go from -rc1 base to -rc3 base, merge in fixes.
Diffstat (limited to 'scripts/kconfig/util.c')
-rw-r--r-- | scripts/kconfig/util.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c index 25d1ec4ca28a..78b5c04e736b 100644 --- a/scripts/kconfig/util.c +++ b/scripts/kconfig/util.c | |||
@@ -78,6 +78,7 @@ struct gstr str_new(void) | |||
78 | struct gstr gs; | 78 | struct gstr gs; |
79 | gs.s = malloc(sizeof(char) * 64); | 79 | gs.s = malloc(sizeof(char) * 64); |
80 | gs.len = 64; | 80 | gs.len = 64; |
81 | gs.max_width = 0; | ||
81 | strcpy(gs.s, "\0"); | 82 | strcpy(gs.s, "\0"); |
82 | return gs; | 83 | return gs; |
83 | } | 84 | } |
@@ -88,6 +89,7 @@ struct gstr str_assign(const char *s) | |||
88 | struct gstr gs; | 89 | struct gstr gs; |
89 | gs.s = strdup(s); | 90 | gs.s = strdup(s); |
90 | gs.len = strlen(s) + 1; | 91 | gs.len = strlen(s) + 1; |
92 | gs.max_width = 0; | ||
91 | return gs; | 93 | return gs; |
92 | } | 94 | } |
93 | 95 | ||