diff options
| author | Peter Jones <pjones@redhat.com> | 2007-10-22 15:15:29 +0000 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2007-10-22 15:15:29 +0000 |
| commit | 8c7f2368b4d3cd015c4a6454bcfa14ff9f278af7 (patch) | |
| tree | 499a483e2294c71bfc70d92a2d25f389e22d85a6 /loader2/cdinstall.c | |
| parent | 93139b6f22d354f212953071337d9c45ebc412b3 (diff) | |
| download | anaconda-8c7f2368b4d3cd015c4a6454bcfa14ff9f278af7.tar.gz anaconda-8c7f2368b4d3cd015c4a6454bcfa14ff9f278af7.tar.xz anaconda-8c7f2368b4d3cd015c4a6454bcfa14ff9f278af7.zip | |
- remove sdupprintf(), use asprintf() instead.
Diffstat (limited to 'loader2/cdinstall.c')
| -rw-r--r-- | loader2/cdinstall.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/loader2/cdinstall.c b/loader2/cdinstall.c index 4a25c6adb..a4c7eedaa 100644 --- a/loader2/cdinstall.c +++ b/loader2/cdinstall.c @@ -134,10 +134,12 @@ static char * mediaCheckCdrom(char *cddriver) { /* output an error message when CD in drive is not the correct one */ /* Used by mountCdromStage2() */ static void wrongCDMessage(void) { - char *buf = sdupprintf(_("The %s disc was not found " - "in any of your drives. Please insert " - "the %s disc and press %s to retry."), - getProductName(), getProductName(), _("OK")); + char *buf = NULL; + int i; + i = asprintf(&buf, (_("The %s disc was not found " + "in any of your drives. Please insert " + "the %s disc and press %s to retry."), + getProductName(), getProductName(), _("OK"))); newtWinMessage(_("Error"), _("OK"), buf, _("OK")); free(buf); } @@ -380,16 +382,17 @@ char * setupCdrom(char * location, struct loaderData_s * loaderData, if (interactive) { char * buf; + int i; if (foundinvalid) - buf = sdupprintf(_("No %s disc was found which matches your " - "boot media. Please insert the %s disc " - "and press %s to retry."), getProductName(), - getProductName(), _("OK")); + i = asprintf(&buf, _("No %s disc was found which matches your " + "boot media. Please insert the %s disc " + "and press %s to retry."), + getProductName(), getProductName(), _("OK")); else - buf = sdupprintf(_("The %s disc was not found in any of your " - "CDROM drives. Please insert the %s disc " - "and press %s to retry."), getProductName(), - getProductName(), _("OK")); + i = asprintf(&buf, _("The %s disc was not found in any of your " + "CDROM drives. Please insert the %s disc " + "and press %s to retry."), + getProductName(), getProductName(), _("OK")); ejectCdrom(); unlink("/tmp/cdrom"); |