Changeset 521 for trunk

Timestamp:

Aug 30, 2018, 6:39:41 PM (6 years ago)

Author:

viala@…

Message:

[boot] Add const qualifier where it's possible.

Fix some gcc warning of "const qualifier discarded" warning.
Because litterals string are of type 'const char *'.

Location:

trunk/boot/tsar_mips32

Files:

• boot_fat32.c (modified) (3 diffs)
• boot_fat32.h (modified) (1 diff)
• boot_tty_driver.c (modified) (1 diff)
• boot_tty_driver.h (modified) (1 diff)
• boot_utils.c (modified) (5 diffs)
• boot_utils.h (modified) (5 diffs)

trunk/boot/tsar_mips32/boot_fat32.c

@@ -401 +401 @@
  * @ returns 0 on success, -1 on error.                                     *
  ****************************************************************************/
-static int get_path_component(char*      pathname,
-                              char*      path_component,
-                              uint32_t * nb_read)
+static int get_path_component( const char * pathname,
+                               char       * path_component,
+                               uint32_t   * nb_read)
 {
     uint32_t pathname_offset;   // index used to scan the LFN entry
@@ -585 +585 @@
  * @ returns 0 on success, -1 on error.                                     *
  ****************************************************************************/
-static int fat_file_search(char*     pathname,
-                           uint32_t* first_cluster,
-                           uint32_t* file_size)
+static int fat_file_search( const char * pathname,
+                            uint32_t   * first_cluster,
+                            uint32_t   * file_size)
 {
     char       path_comp[PATH_MAX_SIZE];    // Buffer for a path component
@@ -886 +886 @@
 
 ///////////////////////////////////////
-int boot_fat32_load( char*    pathname, 
-                     uint32_t buff_addr, 
-                     uint32_t buff_size )
+int boot_fat32_load( const char * pathname,
+                     uint32_t     buff_addr,
+                     uint32_t     buff_size )
 {
     uint32_t cur_cluster;

trunk/boot/tsar_mips32/boot_fat32.h

@@ -361 +361 @@
  * @ returns 0 on success, -1 on error.                                     *
  ****************************************************************************/
-int boot_fat32_load( char*    pathname,
-                     uint32_t buff_addr,
-                     uint32_t buff_size );
+int boot_fat32_load( const char * pathname,
+                     uint32_t     buff_addr,
+                     uint32_t     buff_size );
 
 #endif // BOOT_FAT32_H

trunk/boot/tsar_mips32/boot_tty_driver.c

@@ -74 +74 @@
 
 //////////////////////////////////
-int boot_tty_write( char    * buf,
-                    uint32_t  nbytes )
+int boot_tty_write( const char * buf,
+                    uint32_t     nbytes )
 {
     uint32_t nb_printed;

trunk/boot/tsar_mips32/boot_tty_driver.h

@@ -70 +70 @@
  * @ returns 0 on success, -1 on error.     
  ****************************************************************************/
-int boot_tty_write( char    * buf,
-                    uint32_t  nbytes );
+int boot_tty_write( const char * buf,
+                    uint32_t     nbytes );
 
 #endif // BOOT_TTY_DRIVER_H

trunk/boot/tsar_mips32/boot_utils.c

@@ -282 +282 @@
 
 ///////////////////////////////////////
-void boot_strcpy(char* dest, char* src)
+void boot_strcpy( char * dest, const char * src)
 {
     /* Checking if the arguments are correct. */
@@ -294 +294 @@
 
 /////////////////////////////
-uint32_t boot_strlen(char* s)
+uint32_t boot_strlen( const char * s )
 {
     uint32_t res = 0;   /* Length of the string (in bytes).             */
@@ -309 +309 @@
 
 ///////////////////////////////////
-int boot_strcmp(char* s1, char* s2)
+int boot_strcmp( const char * s1, const char * s2 )
 {
     if ((s1 == NULL) || (s2 == NULL))
@@ -333 +333 @@
 
 /////////////////////////
-void boot_puts(char* str)
+void boot_puts( const char * str )
 {
     boot_tty_write(str, boot_strlen(str));
@@ -340 +340 @@
     
 ///////////////////////////////////////
-void boot_printf( char * format , ... )
+void boot_printf( const char * format , ... )
 {
     va_list args;

trunk/boot/tsar_mips32/boot_utils.h

@@ -150 +150 @@
  * @ dest   : pointer to the destination string. 
  ****************************************************************************/
-void boot_strcpy(char* dest, char* src);
+void boot_strcpy( char* dest, const char * src );
 
 /****************************************************************************
@@ -158 +158 @@
  * @ returns the number of bytes in the string. 
  ****************************************************************************/
-uint32_t boot_strlen(char* s);
+uint32_t boot_strlen( const char * s );
 
 /****************************************************************************
@@ -166 +166 @@
  * @ returns 0 if these 2 strings match, 1 otherwise. 
  ****************************************************************************/
-int boot_strcmp(char* s1, char* s2);
+int boot_strcmp( const char * s1, const char * s2 );
 
 /****************************************************************************
@@ -177 +177 @@
  * @ str    : pointer to the string to be printed on the boot TTY terminal.
  ****************************************************************************/
-void boot_puts(char* str);
+void boot_puts( const char* str );
 
 /****************************************************************************
@@ -200 +200 @@
  *  - %s : NUL terminated string.  
  ****************************************************************************/
-void boot_printf(char* format, ...);
+void boot_printf( const char* format, ... );
 
 /****************************************************************************