From bdb676b90dfa25bf193525d84b68eb0db55c48d5 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 8 Jul 2011 05:20:24 +0000 Subject: [PATCH] firmware-utils: rename the devname variable in mkwrgimg to avoid a clash with a BSD stdlib function SVN-Revision: 27553 --- tools/firmware-utils/src/mkwrgimg.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/firmware-utils/src/mkwrgimg.c b/tools/firmware-utils/src/mkwrgimg.c index 052c4f9818..3915d146cf 100644 --- a/tools/firmware-utils/src/mkwrgimg.c +++ b/tools/firmware-utils/src/mkwrgimg.c @@ -49,7 +49,7 @@ static char *progname; static char *ifname; static char *ofname; static char *signature; -static char *devname; +static char *dev_name; static uint32_t offset; static int big_endian; @@ -128,7 +128,7 @@ int main(int argc, char *argv[]) big_endian = 1; break; case 'd': - devname = optarg; + dev_name = optarg; break; case 'i': ifname = optarg; @@ -167,7 +167,7 @@ int main(int argc, char *argv[]) goto err; } - if (devname == NULL) { + if (dev_name == NULL) { ERR("no device name specified"); goto err; } @@ -202,7 +202,7 @@ int main(int argc, char *argv[]) memset(header, '\0', sizeof(struct wrg_header)); strncpy(header->signature, signature, sizeof(header->signature)); - strncpy(header->devname, devname, sizeof(header->signature)); + strncpy(header->devname, dev_name, sizeof(header->signature)); put_u32(&header->magic1, WRG_MAGIC); put_u32(&header->magic2, WRG_MAGIC); put_u32(&header->size, st.st_size); -- 2.30.2