Changeset 9a12c7e5 in rtems for c/src/lib/libbsp/arm/nds/tools/ndstool

Timestamp:

05/04/09 02:04:42 (13 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 5, master

Children:

adada0d

Parents:

9c2eaca

Message:

2009-05-03 Joel Sherrill <joel.sherrill@…>

• ndstool/include/banner.h, ndstool/include/header.h, ndstool/include/ndstree.h, ndstool/source/banner.cpp, ndstool/source/header.cpp, ndstool/source/ndscreate.cpp, ndstool/source/ndstool.cpp, ndstool/source/passme.cpp: Remove warnings for deprecated character conversions.

Location:

c/src/lib/libbsp/arm/nds/tools/ndstool

Files:

• include/banner.h (modified) (1 diff)
• include/header.h (modified) (1 diff)
• include/ndstree.h (modified) (3 diffs)
• source/banner.cpp (modified) (1 diff)
• source/header.cpp (modified) (1 diff)
• source/ndscreate.cpp (modified) (2 diffs)
• source/ndstool.cpp (modified) (2 diffs)
• source/passme.cpp (modified) (1 diff)

c/src/lib/libbsp/arm/nds/tools/ndstool/include/banner.h

@@ -13 +13 @@
 #pragma pack()
 
-extern char *bannerLanguages[];
+extern const char *bannerLanguages[];
 
 int InsertTitleString(char *String, FILE *file);

c/src/lib/libbsp/arm/nds/tools/ndstool/include/header.h

@@ -73 +73 @@
 struct Country
 {
-        char countrycode;
-        char *name;
+        const char countrycode;
+        const char *name;
 };
 
 struct Maker
 {
-        char *makercode;
-        char *name;
+        const char *makercode;
+        const char *name;
 };
 

c/src/lib/libbsp/arm/nds/tools/ndstool/include/ndstree.h

@@ -1 @@
-inline int cmp(char *a, bool a_isdir, char *b, bool b_isdir)
+inline int cmp(const char *a, bool a_isdir, const char *b, bool b_isdir)
 {
         // oh... directory sort doesn't matter since we write out dir- and filenames seperately
@@ -10 +10 @@
 {
         unsigned int dir_id;            // directory ID in case of directory entry
-        char *name;                                     // file or directory name
+        const char *name;               // file or directory name
         TreeNode *directory;            // nonzero indicates directory. first directory node is a dummy
         TreeNode *prev, *next;          // linked list
@@ -23 +23 @@
         
         // new entry in same directory
-        TreeNode *New(char *name, bool isdir)
+        TreeNode *New(const char *name, bool isdir)
         {
                 TreeNode *newNode = new TreeNode();

c/src/lib/libbsp/arm/nds/tools/ndstool/source/banner.cpp

@@ -4 +4 @@
 #include "crc.h"
 
-char *bannerLanguages[] = { "Japanese", "English", "French", "German", "Italian", "Spanish" };
+const char *bannerLanguages[] = { "Japanese", "English", "French", "German", "Italian", "Spanish" };
 
 #define RGB16(r,g,b)                    ((r) | (g<<5) | (b<<10))

c/src/lib/libbsp/arm/nds/tools/ndstool/source/header.cpp

@@ -172 +172 @@
         printf("0x68\t%-25s\t0x%X\n", "Icon/title offset", (int)header.banner_offset);
         unsigned short secure_area_crc = CalcSecureAreaCRC((romType == ROMTYPE_NDSDUMPED));
-        char *s1, *s2 = "";
+        const char *s1, *s2 = "";
         if (romType == ROMTYPE_HOMEBREW) s1 = "-";
         else if (secure_area_crc == header.secure_area_crc) s1 = "OK";

c/src/lib/libbsp/arm/nds/tools/ndstool/source/ndscreate.cpp

@@ -149 +149 @@
  * AddFile
  */
-void AddFile(char *rootdir, char *prefix, char *entry_name, unsigned int file_id)
+void AddFile(char *rootdir, const char *prefix, const char *entry_name, unsigned int file_id)
 {
         // make filename
@@ -203 +203 @@
  * Walks the tree and adds files to NDS
  */
-void AddDirectory(TreeNode *node, char *prefix, unsigned int this_dir_id, unsigned int _parent_id)
+void AddDirectory(TreeNode *node, const char *prefix, unsigned int this_dir_id, unsigned int _parent_id)
 {
         // skip dummy node

c/src/lib/libbsp/arm/nds/tools/ndstool/source/ndstool.cpp

@@ -65 +65 @@
 struct HelpLine
 {
-        char *option_char;
-        char *text;
+        const char *option_char;
+        const char *text;
 
         void Print()
@@ -134 +134 @@
                 for (unsigned int i=0; i<(sizeof(helplines) / sizeof(helplines[0])); i++)
                 {
-                        for (char *o = helplines[i].option_char; *o; o++)
+                        for (const char *o = helplines[i].option_char; *o; o++)
                         {
                                 if (*o == *specificoption) { helplines[i].Print(); found = true; }

c/src/lib/libbsp/arm/nds/tools/ndstool/source/passme.cpp

@@ -16 +16 @@
  * Find
  */
-template <typename T> unsigned long Find(FILE *f, char *fmt, unsigned long begin, unsigned long end, T data, T mask, int thumb, int armnr)
+template <typename T> unsigned long Find(FILE *f, const char *fmt, unsigned long begin, unsigned long end, T data, T mask, int thumb, int armnr)
 {
         for (unsigned long i=begin; i<end; i+=sizeof(T))