diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-02-06 09:09:41 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-02-12 09:33:43 +0100 |
| commit | 10a0aaabfeca64519430fb3ee5a91260a7305cf5 (patch) | |
| tree | 5bfb5756a15f0121c3b431948cfdb4a33f5db6ae | |
| parent | d397eb61628bde91503aa562a9fa939a3e07fc97 (diff) | |
| download | barebox-10a0aaabfeca64519430fb3ee5a91260a7305cf5.tar.gz barebox-10a0aaabfeca64519430fb3ee5a91260a7305cf5.tar.xz | |
cmdlinepart: make argument types safer
The return size should be loff_t to support partitions bigger
than 4G. Also use const for the devname and endp.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | commands/partition.c | 4 | ||||
| -rw-r--r-- | include/cmdlinepart.h | 6 | ||||
| -rw-r--r-- | lib/cmdlinepart.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/commands/partition.c b/commands/partition.c index c95433f3e0..17ca136f9e 100644 --- a/commands/partition.c +++ b/commands/partition.c @@ -41,7 +41,7 @@ static int do_addpart(int argc, char *argv[]) { char *devname; - char *endp; + const char *endp; loff_t offset = 0; loff_t devsize; struct stat s; @@ -70,7 +70,7 @@ static int do_addpart(int argc, char *argv[]) endp = argv[optind + 1]; while (1) { - size_t size = 0; + loff_t size = 0; if (cmdlinepart_do_parse_one(devname, endp, &endp, &offset, devsize, &size, flags)) diff --git a/include/cmdlinepart.h b/include/cmdlinepart.h index 5ffa3c4aa3..3f8e136362 100644 --- a/include/cmdlinepart.h +++ b/include/cmdlinepart.h @@ -3,9 +3,9 @@ #define CMDLINEPART_ADD_DEVNAME (1 << 0) -int cmdlinepart_do_parse_one(char *devname, const char *partstr, - char **endp, loff_t *offset, - loff_t devsize, size_t *retsize, +int cmdlinepart_do_parse_one(const char *devname, const char *partstr, + const char **endp, loff_t *offset, + loff_t devsize, loff_t *retsize, unsigned int partition_flags); #endif /* __CMD_LINE_PART_H */ diff --git a/lib/cmdlinepart.c b/lib/cmdlinepart.c index 4781d82569..935158755c 100644 --- a/lib/cmdlinepart.c +++ b/lib/cmdlinepart.c @@ -24,9 +24,9 @@ #define SIZE_REMAINING ((loff_t)-1) -int cmdlinepart_do_parse_one(char *devname, const char *partstr, - char **endp, loff_t *offset, - loff_t devsize, size_t *retsize, +int cmdlinepart_do_parse_one(const char *devname, const char *partstr, + const char **endp, loff_t *offset, + loff_t devsize, loff_t *retsize, unsigned int partition_flags) { loff_t size; |