diff options
| author | James Buren <braewoods+rb@braewoods.net> | 2021-04-06 21:56:55 -0500 |
|---|---|---|
| committer | Solomon Peachy <pizza@shaftnet.org> | 2021-04-23 01:01:31 +0000 |
| commit | f968d6032ab32db179a7617158078e488b1f0748 (patch) | |
| tree | 2bc71f83b81ad7c08c0cc26ebe65c80b398856be | |
| parent | 79d1b68fe29a4963fb17ef47426b6df3847212c1 (diff) | |
| download | rockbox-f968d6032ab32db179a7617158078e488b1f0748.tar.gz rockbox-f968d6032ab32db179a7617158078e488b1f0748.zip | |
ipodpatcher: fix warning for apple stop sign constant
Convert both instances of the apple stop sign constant
to char array instances. This ensures sizeof will work
as expected when applied to the constant.
Change-Id: I8599f7b0a00031e944e654b12a0bc59309926807
| -rw-r--r-- | rbutil/ipodpatcher/ipodpatcher.c | 32 | ||||
| -rw-r--r-- | tools/scramble.c | 32 |
2 files changed, 32 insertions, 32 deletions
diff --git a/rbutil/ipodpatcher/ipodpatcher.c b/rbutil/ipodpatcher/ipodpatcher.c index 6df9060bdc..e047e52abe 100644 --- a/rbutil/ipodpatcher/ipodpatcher.c +++ b/rbutil/ipodpatcher/ipodpatcher.c | |||
| @@ -53,22 +53,22 @@ int ipod_verbose = 0; | |||
| 53 | 53 | ||
| 54 | 54 | ||
| 55 | /* The following string appears at the start of the firmware partition */ | 55 | /* The following string appears at the start of the firmware partition */ |
| 56 | static const char *apple_stop_sign = "{{~~ /-----\\ "\ | 56 | static const char apple_stop_sign[] = "{{~~ /-----\\ "\ |
| 57 | "{{~~ / \\ "\ | 57 | "{{~~ / \\ "\ |
| 58 | "{{~~| | "\ | 58 | "{{~~| | "\ |
| 59 | "{{~~| S T O P | "\ | 59 | "{{~~| S T O P | "\ |
| 60 | "{{~~| | "\ | 60 | "{{~~| | "\ |
| 61 | "{{~~ \\ / "\ | 61 | "{{~~ \\ / "\ |
| 62 | "{{~~ \\-----/ "\ | 62 | "{{~~ \\-----/ "\ |
| 63 | "Copyright(C) 200"\ | 63 | "Copyright(C) 200"\ |
| 64 | "1 Apple Computer"\ | 64 | "1 Apple Computer"\ |
| 65 | ", Inc.----------"\ | 65 | ", Inc.----------"\ |
| 66 | "----------------"\ | 66 | "----------------"\ |
| 67 | "----------------"\ | 67 | "----------------"\ |
| 68 | "----------------"\ | 68 | "----------------"\ |
| 69 | "----------------"\ | 69 | "----------------"\ |
| 70 | "----------------"\ | 70 | "----------------"\ |
| 71 | "---------------"; | 71 | "---------------"; |
| 72 | 72 | ||
| 73 | /* Windows requires the buffer for disk I/O to be aligned in memory on a | 73 | /* Windows requires the buffer for disk I/O to be aligned in memory on a |
| 74 | multiple of the disk volume size - so we use a single global variable | 74 | multiple of the disk volume size - so we use a single global variable |
diff --git a/tools/scramble.c b/tools/scramble.c index a529caea03..24ed4ba0e6 100644 --- a/tools/scramble.c +++ b/tools/scramble.c | |||
| @@ -663,22 +663,22 @@ static int iaudio_encode(char *iname, char *oname, char *idstring) | |||
| 663 | 663 | ||
| 664 | static int ipod_encode(char *iname, char *oname, int fw_ver, bool fake_rsrc) | 664 | static int ipod_encode(char *iname, char *oname, int fw_ver, bool fake_rsrc) |
| 665 | { | 665 | { |
| 666 | static const char *apple_stop_sign = "{{~~ /-----\\ "\ | 666 | static const char apple_stop_sign[] = "{{~~ /-----\\ "\ |
| 667 | "{{~~ / \\ "\ | 667 | "{{~~ / \\ "\ |
| 668 | "{{~~| | "\ | 668 | "{{~~| | "\ |
| 669 | "{{~~| S T O P | "\ | 669 | "{{~~| S T O P | "\ |
| 670 | "{{~~| | "\ | 670 | "{{~~| | "\ |
| 671 | "{{~~ \\ / "\ | 671 | "{{~~ \\ / "\ |
| 672 | "{{~~ \\-----/ "\ | 672 | "{{~~ \\-----/ "\ |
| 673 | "Copyright(C) 200"\ | 673 | "Copyright(C) 200"\ |
| 674 | "1 Apple Computer"\ | 674 | "1 Apple Computer"\ |
| 675 | ", Inc.----------"\ | 675 | ", Inc.----------"\ |
| 676 | "----------------"\ | 676 | "----------------"\ |
| 677 | "----------------"\ | 677 | "----------------"\ |
| 678 | "----------------"\ | 678 | "----------------"\ |
| 679 | "----------------"\ | 679 | "----------------"\ |
| 680 | "----------------"\ | 680 | "----------------"\ |
| 681 | "---------------"; | 681 | "---------------"; |
| 682 | size_t len; | 682 | size_t len; |
| 683 | int length; | 683 | int length; |
| 684 | int rsrclength; | 684 | int rsrclength; |