projects
/
librecmc
/
librecmc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bf11563
)
firmware-utils: rename the devname variable in mkwrgimg to avoid a clash with a BSD...
author
Felix Fietkau
<nbd@openwrt.org>
Fri, 8 Jul 2011 05:20:24 +0000
(
05:20
+0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Fri, 8 Jul 2011 05:20:24 +0000
(
05:20
+0000)
SVN-Revision: 27553
tools/firmware-utils/src/mkwrgimg.c
patch
|
blob
|
history
diff --git
a/tools/firmware-utils/src/mkwrgimg.c
b/tools/firmware-utils/src/mkwrgimg.c
index 052c4f981842ebec81548bcdff867a3733babcf0..3915d146cff11bd41f054d7ef5b8c2abd1e79c0a 100644
(file)
--- 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 *ifname;
static char *ofname;
static char *signature;
-static char *devname;
+static char *dev
_
name;
static uint32_t offset;
static int big_endian;
static uint32_t offset;
static int big_endian;
@@
-128,7
+128,7
@@
int main(int argc, char *argv[])
big_endian = 1;
break;
case 'd':
big_endian = 1;
break;
case 'd':
- devname = optarg;
+ dev
_
name = optarg;
break;
case 'i':
ifname = optarg;
break;
case 'i':
ifname = optarg;
@@
-167,7
+167,7
@@
int main(int argc, char *argv[])
goto err;
}
goto err;
}
- if (devname == NULL) {
+ if (dev
_
name == NULL) {
ERR("no device name specified");
goto err;
}
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));
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);
put_u32(&header->magic1, WRG_MAGIC);
put_u32(&header->magic2, WRG_MAGIC);
put_u32(&header->size, st.st_size);