Commit d717f24d authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kconfig: add xrealloc() helper 



We already have xmalloc(), xcalloc().  Add xrealloc() as well
to save tedious error handling.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent 9e3e10c7

scripts/kconfig/confdata.c

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static int add_byte(int c, char **lineptr, size_t slen, size_t *n) 
	if (new_size > *n) {

		new_size += LINE_GROWTH - 1;

		new_size *= 2;

		nline = realloc(*lineptr, new_size);

		nline = xrealloc(*lineptr, new_size);

		if (!nline)

			return -1;

scripts/kconfig/lkc.h

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ struct file *file_lookup(const char *name); 
int file_write_dep(const char *name);

void *xmalloc(size_t size);

void *xcalloc(size_t nmemb, size_t size);

void *xrealloc(void *p, size_t size);



struct gstr {

	size_t len;

scripts/kconfig/nconf.gui.c

+2 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 *

 */

#include "nconf.h"

#include "lkc.h"



/* a list of all the different widgets we use */

attributes_t attributes[ATTR_MAX+1] = {0};
@@ -374,7 +375,7 @@ int dialog_inputbox(WINDOW *main_window, 


	if (strlen(init)+1 > *result_len) {

		*result_len = strlen(init)+1;

		*resultp = result = realloc(result, *result_len);

		*resultp = result = xrealloc(result, *result_len);

	}



	/* find the widest line of msg: */

scripts/kconfig/symbol.c

+1 −1
Original line number Diff line number Diff line
@@ -936,7 +936,7 @@ const char *sym_expand_string_value(const char *in) 
		newlen = strlen(res) + strlen(symval) + strlen(src) + 1;

		if (newlen > reslen) {

			reslen = newlen;

			res = realloc(res, reslen);

			res = xrealloc(res, reslen);

		}



		strcat(res, symval);

scripts/kconfig/util.c

+10 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ void str_append(struct gstr *gs, const char *s) 
	if (s) {

		l = strlen(gs->s) + strlen(s) + 1;

		if (l > gs->len) {

			gs->s   = realloc(gs->s, l);

			gs->s = xrealloc(gs->s, l);

			gs->len = l;

		}

		strcat(gs->s, s);
@@ -145,3 +145,12 @@ void *xcalloc(size_t nmemb, size_t size) 
	fprintf(stderr, "Out of memory.\n");

	exit(1);

}



void *xrealloc(void *p, size_t size)

{

	p = realloc(p, size);

	if (p)

		return p;

	fprintf(stderr, "Out of memory.\n");

	exit(1);

}