Changeset 9a12c7e5 in rtems


Ignore:
Timestamp:
May 4, 2009, 2:04:42 AM (10 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 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
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/arm/nds/tools/ChangeLog

    r9c2eaca r9a12c7e5  
     12009-05-03      Joel Sherrill <joel.sherrill@oarcorp.com>
     2
     3        * ndstool/include/banner.h, ndstool/include/header.h,
     4        ndstool/include/ndstree.h, ndstool/source/banner.cpp,
     5        ndstool/source/header.cpp, ndstool/source/ndscreate.cpp,
     6        ndstool/source/ndstool.cpp, ndstool/source/passme.cpp: Remove
     7        warnings for deprecated character conversions.
     8
    192008-08-19      Joel Sherrill <joel.sherrill@OARcorp.com>
    210
  • c/src/lib/libbsp/arm/nds/tools/ndstool/include/banner.h

    r9c2eaca r9a12c7e5  
    1313#pragma pack()
    1414
    15 extern char *bannerLanguages[];
     15extern const char *bannerLanguages[];
    1616
    1717int InsertTitleString(char *String, FILE *file);
  • c/src/lib/libbsp/arm/nds/tools/ndstool/include/header.h

    r9c2eaca r9a12c7e5  
    7373struct Country
    7474{
    75         char countrycode;
    76         char *name;
     75        const char countrycode;
     76        const char *name;
    7777};
    7878
    7979struct Maker
    8080{
    81         char *makercode;
    82         char *name;
     81        const char *makercode;
     82        const char *name;
    8383};
    8484
  • c/src/lib/libbsp/arm/nds/tools/ndstool/include/ndstree.h

    r9c2eaca r9a12c7e5  
    1 inline int cmp(char *a, bool a_isdir, char *b, bool b_isdir)
     1inline int cmp(const char *a, bool a_isdir, const char *b, bool b_isdir)
    22{
    33        // oh... directory sort doesn't matter since we write out dir- and filenames seperately
     
    1010{
    1111        unsigned int dir_id;            // directory ID in case of directory entry
    12         char *name;                                     // file or directory name
     12        const char *name;               // file or directory name
    1313        TreeNode *directory;            // nonzero indicates directory. first directory node is a dummy
    1414        TreeNode *prev, *next;          // linked list
     
    2323       
    2424        // new entry in same directory
    25         TreeNode *New(char *name, bool isdir)
     25        TreeNode *New(const char *name, bool isdir)
    2626        {
    2727                TreeNode *newNode = new TreeNode();
  • c/src/lib/libbsp/arm/nds/tools/ndstool/source/banner.cpp

    r9c2eaca r9a12c7e5  
    44#include "crc.h"
    55
    6 char *bannerLanguages[] = { "Japanese", "English", "French", "German", "Italian", "Spanish" };
     6const char *bannerLanguages[] = { "Japanese", "English", "French", "German", "Italian", "Spanish" };
    77
    88#define RGB16(r,g,b)                    ((r) | (g<<5) | (b<<10))
  • c/src/lib/libbsp/arm/nds/tools/ndstool/source/header.cpp

    r9c2eaca r9a12c7e5  
    172172        printf("0x68\t%-25s\t0x%X\n", "Icon/title offset", (int)header.banner_offset);
    173173        unsigned short secure_area_crc = CalcSecureAreaCRC((romType == ROMTYPE_NDSDUMPED));
    174         char *s1, *s2 = "";
     174        const char *s1, *s2 = "";
    175175        if (romType == ROMTYPE_HOMEBREW) s1 = "-";
    176176        else if (secure_area_crc == header.secure_area_crc) s1 = "OK";
  • c/src/lib/libbsp/arm/nds/tools/ndstool/source/ndscreate.cpp

    r9c2eaca r9a12c7e5  
    149149 * AddFile
    150150 */
    151 void AddFile(char *rootdir, char *prefix, char *entry_name, unsigned int file_id)
     151void AddFile(char *rootdir, const char *prefix, const char *entry_name, unsigned int file_id)
    152152{
    153153        // make filename
     
    203203 * Walks the tree and adds files to NDS
    204204 */
    205 void AddDirectory(TreeNode *node, char *prefix, unsigned int this_dir_id, unsigned int _parent_id)
     205void AddDirectory(TreeNode *node, const char *prefix, unsigned int this_dir_id, unsigned int _parent_id)
    206206{
    207207        // skip dummy node
  • c/src/lib/libbsp/arm/nds/tools/ndstool/source/ndstool.cpp

    r9c2eaca r9a12c7e5  
    6565struct HelpLine
    6666{
    67         char *option_char;
    68         char *text;
     67        const char *option_char;
     68        const char *text;
    6969
    7070        void Print()
     
    134134                for (unsigned int i=0; i<(sizeof(helplines) / sizeof(helplines[0])); i++)
    135135                {
    136                         for (char *o = helplines[i].option_char; *o; o++)
     136                        for (const char *o = helplines[i].option_char; *o; o++)
    137137                        {
    138138                                if (*o == *specificoption) { helplines[i].Print(); found = true; }
  • c/src/lib/libbsp/arm/nds/tools/ndstool/source/passme.cpp

    r9c2eaca r9a12c7e5  
    1616 * Find
    1717 */
    18 template <typename T> unsigned long Find(FILE *f, char *fmt, unsigned long begin, unsigned long end, T data, T mask, int thumb, int armnr)
     18template <typename T> unsigned long Find(FILE *f, const char *fmt, unsigned long begin, unsigned long end, T data, T mask, int thumb, int armnr)
    1919{
    2020        for (unsigned long i=begin; i<end; i+=sizeof(T))
Note: See TracChangeset for help on using the changeset viewer.