aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/kconfig
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2012-11-20 06:12:57 -0500
committerMichal Marek <mmarek@suse.cz>2012-11-20 06:12:57 -0500
commit527ffe5811e39f9997a08902628c35068a46a5b7 (patch)
tree2567e610a6aceffbab4aae9f96a44643fe5d51dd /scripts/kconfig
parent177acf78468bf5c359bcb8823ee3bd48b04b8380 (diff)
kconfig: Regenerate lexer
Apply changes from commit 177acf78 (kconfig: Fix malloc handling in conf tools) to the _shipped file. Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts/kconfig')
-rw-r--r--scripts/kconfig/zconf.lex.c_shipped8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/kconfig/zconf.lex.c_shipped b/scripts/kconfig/zconf.lex.c_shipped
index c32b1a49f5a3..a0521aa5974b 100644
--- a/scripts/kconfig/zconf.lex.c_shipped
+++ b/scripts/kconfig/zconf.lex.c_shipped
@@ -802,7 +802,7 @@ static void zconf_endfile(void);
802 802
803static void new_string(void) 803static void new_string(void)
804{ 804{
805 text = malloc(START_STRSIZE); 805 text = xmalloc(START_STRSIZE);
806 text_asize = START_STRSIZE; 806 text_asize = START_STRSIZE;
807 text_size = 0; 807 text_size = 0;
808 *text = 0; 808 *text = 0;
@@ -824,7 +824,7 @@ static void append_string(const char *str, int size)
824 824
825static void alloc_string(const char *str, int size) 825static void alloc_string(const char *str, int size)
826{ 826{
827 text = malloc(size + 1); 827 text = xmalloc(size + 1);
828 memcpy(text, str, size); 828 memcpy(text, str, size);
829 text[size] = 0; 829 text[size] = 0;
830} 830}
@@ -2343,7 +2343,7 @@ void zconf_initscan(const char *name)
2343 exit(1); 2343 exit(1);
2344 } 2344 }
2345 2345
2346 current_buf = malloc(sizeof(*current_buf)); 2346 current_buf = xmalloc(sizeof(*current_buf));
2347 memset(current_buf, 0, sizeof(*current_buf)); 2347 memset(current_buf, 0, sizeof(*current_buf));
2348 2348
2349 current_file = file_lookup(name); 2349 current_file = file_lookup(name);
@@ -2354,7 +2354,7 @@ void zconf_nextfile(const char *name)
2354{ 2354{
2355 struct file *iter; 2355 struct file *iter;
2356 struct file *file = file_lookup(name); 2356 struct file *file = file_lookup(name);
2357 struct buffer *buf = malloc(sizeof(*buf)); 2357 struct buffer *buf = xmalloc(sizeof(*buf));
2358 memset(buf, 0, sizeof(*buf)); 2358 memset(buf, 0, sizeof(*buf));
2359 2359
2360 current_buf->state = YY_CURRENT_BUFFER; 2360 current_buf->state = YY_CURRENT_BUFFER;