diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-07-08 05:20:24 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-07-08 05:20:24 +0000 |
| commit | 4903cab0d4536a42bdc4ad8c6e39e4d31888dd8c (patch) | |
| tree | f9fe6c132ead88edd01387edf83819a3ec1eced0 /tools/firmware-utils | |
| parent | 00dc80b385fac0ff41fa5713818320082b4a8b07 (diff) | |
| download | upstream-4903cab0d4536a42bdc4ad8c6e39e4d31888dd8c.tar.gz upstream-4903cab0d4536a42bdc4ad8c6e39e4d31888dd8c.tar.bz2 upstream-4903cab0d4536a42bdc4ad8c6e39e4d31888dd8c.zip | |
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')
| -rw-r--r-- | tools/firmware-utils/src/mkwrgimg.c | 8 |
1 files 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); |