From: Vincent Bernat Date: Sun, 16 Nov 2008 21:10:16 +0000 (+0100) Subject: Use strdup instead of asprintf("%s") X-Git-Tag: 0.2~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=249644a4e5f25bff8946ae1cd4a21204c779ddf8;p=thirdparty%2Flldpd.git Use strdup instead of asprintf("%s") --- diff --git a/src/lldpd.c b/src/lldpd.c index f4108617..fb82c8ba 100644 --- a/src/lldpd.c +++ b/src/lldpd.c @@ -553,7 +553,7 @@ lldpd_port_add(struct lldpd *cfg, struct ifaddrs *ifa) if ((vlan = (struct lldpd_vlan *) calloc(1, sizeof(struct lldpd_vlan))) == NULL) continue; - if (asprintf(&vlan->v_name, "%s", oifa->ifa_name) == -1) { + if ((vlan->v_name = strdup(oifa->ifa_name)) == NULL) { free(vlan); continue; } @@ -1164,9 +1164,8 @@ lldpd_loop(struct lldpd *cfg) fatal("failed to get system name"); free(cfg->g_lchassis.c_name); free(cfg->g_lchassis.c_descr); - if (asprintf(&cfg->g_lchassis.c_name, "%s", - hp) == -1) - fatal("failed to set system name"); + if ((cfg->g_lchassis.c_name = strdup(hp)) == NULL) + fatal(NULL); if (asprintf(&cfg->g_lchassis.c_descr, "%s %s %s %s", un->sysname, un->release, un->version, un->machine) == -1) fatal("failed to set system description");