summaryrefslogtreecommitdiffstats
path: root/tools/firmware-utils/src
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-07-08 05:20:24 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-07-08 05:20:24 +0000
commit75b703b4079c5cb797c651770ea1fdb4dc788232 (patch)
treef9fe6c132ead88edd01387edf83819a3ec1eced0 /tools/firmware-utils/src
parent558b8fc2fd5791772ffca0eaa2afcd2835888a77 (diff)
firmware-utils: rename the devname variable in mkwrgimg to avoid a clash with a BSD stdlib function
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27553 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/firmware-utils/src')
-rw-r--r--tools/firmware-utils/src/mkwrgimg.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/firmware-utils/src/mkwrgimg.c b/tools/firmware-utils/src/mkwrgimg.c
index 052c4f981..3915d146c 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);