summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2008-08-27 18:10:18 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2008-08-27 18:10:18 +0200
commit60fb727353199e533ce15225c0d2b5099aad85a8 (patch)
treece05b9fa74215dd6673ddf52480fc405f3f32bc8
parent3d3d4a6c3bea95ecf3597bf51963c53c0b54845f (diff)
downloadbarebox-60fb727353199e533ce15225c0d2b5099aad85a8.tar.gz
barebox-60fb727353199e533ce15225c0d2b5099aad85a8.tar.xz
Revert "partition: fix compiler warning"
Grumpf. Better compiler warnings than broken code :( This reverts commit 8201d7c5fc46b3355692731f22f0e8631faf51d4.
-rwxr-xr-xcommands/partition.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/commands/partition.c b/commands/partition.c
index b914d51111..399cb62005 100755
--- a/commands/partition.c
+++ b/commands/partition.c
@@ -133,23 +133,23 @@ static int mtd_part_do_parse_one(struct partition *part, const char *partstr,
partstr = end;
if (*partstr == '(') {
- const char *bclose;
-
partstr++;
- bclose = strchr(partstr, ')');
- if (!bclose) {
+ end = strchr(partstr, ')');
+ if (!end) {
printf("could not find matching ')'\n");
return -EINVAL;
}
- if (bclose - partstr >= MAX_DRIVER_NAME) {
+ if (end - partstr >= MAX_DRIVER_NAME) {
printf("device name too long\n");
return -EINVAL;
}
- memcpy(part->name, partstr, bclose - partstr);
- partstr = bclose + 1;
+ memcpy(part->name, partstr, end - partstr);
+ end++;
}
+ partstr = end;
+
if (*partstr == 'r' && *(partstr + 1) == 'o') {
part->flags |= PARTITION_READONLY;
end = (char *)(partstr + 2);