diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-01-13 18:38:30 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-01-13 18:38:30 +0000 |
| commit | d49eeebb3db74cfb2d68a6989c14f1c9961357b7 (patch) | |
| tree | e785f2e30401d67ef797f7a4fa6988dedf75f3c1 /mdk-stage1/automatic.c | |
| parent | c990f18b155433c4069e1210cfb48d1b3c033ffb (diff) | |
| download | drakx-d49eeebb3db74cfb2d68a6989c14f1c9961357b7.tar drakx-d49eeebb3db74cfb2d68a6989c14f1c9961357b7.tar.gz drakx-d49eeebb3db74cfb2d68a6989c14f1c9961357b7.tar.bz2 drakx-d49eeebb3db74cfb2d68a6989c14f1c9961357b7.tar.xz drakx-d49eeebb3db74cfb2d68a6989c14f1c9961357b7.zip | |
(memdup) rename as _memdup() in order to prevent a symbol clash with libkmod
Diffstat (limited to 'mdk-stage1/automatic.c')
| -rw-r--r-- | mdk-stage1/automatic.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mdk-stage1/automatic.c b/mdk-stage1/automatic.c index 561aa62d9..804c301cc 100644 --- a/mdk-stage1/automatic.c +++ b/mdk-stage1/automatic.c @@ -46,14 +46,14 @@ void grab_automatic_params(char * line) int j = i; while (line[i] != ':' && line[i] != '\0') i++; - name = memdup(&line[j], i-j + 1); + name = _memdup(&line[j], i-j + 1); name[i-j] = 0; k = i+1; i++; while (line[i] != ',' && line[i] != '\0') i++; - value = memdup(&line[k], i-k + 1); + value = _memdup(&line[k], i-k + 1); value[i-k] = 0; tmp_params[p].name = name; @@ -65,7 +65,7 @@ void grab_automatic_params(char * line) } tmp_params[p++].name = NULL; - automatic_params = memdup(tmp_params, sizeof(struct param_elem) * p); + automatic_params = _memdup(tmp_params, sizeof(struct param_elem) * p); log_message("AUTOMATIC MODE: got %d params", p-1); } @@ -160,7 +160,7 @@ enum return_type ask_from_entries_auto(char *msg, char ** questions, char *** an questions_auto++; } - *answers = memdup(tmp_answers, sizeof(char *) * i); + *answers = _memdup(tmp_answers, sizeof(char *) * i); return RETURN_OK; } } |