Changeset a000878c in mainline for kernel/arch/ia64/src/interrupt.c

Timestamp:

2010-02-25T19:11:25Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

958de16

Parents:

a634485

Message:

make sure that all statically allocated strings are declared as "const char *"
and are treated as read-only

File:

• kernel/arch/ia64/src/interrupt.c (modified) (6 diffs)

kernel/arch/ia64/src/interrupt.c

@@ -64 +64 @@
 #define BUNDLE_SIZE             16
 
-char *vector_names_64_bundle[VECTORS_64_BUNDLE] = {
+static const char *vector_names_64_bundle[VECTORS_64_BUNDLE] = {
         "VHPT Translation vector",
         "Instruction TLB vector",
@@ -87 +87 @@
 };
 
-char *vector_names_16_bundle[VECTORS_16_BUNDLE] = {
+static const char *vector_names_16_bundle[VECTORS_16_BUNDLE] = {
         "Page Not Present vector",
         "Key Permission vector",
@@ -121 +121 @@
 };
 
-static char *vector_to_string(uint16_t vector);
-static void dump_interrupted_context(istate_t *istate);
-
-char *vector_to_string(uint16_t vector)
+static const char *vector_to_string(uint16_t vector)
 {
         ASSERT(vector <= VECTOR_MAX);
@@ -135 +132 @@
 }
 
-void dump_interrupted_context(istate_t *istate)
-{
-        char *ifa, *iipa, *iip;
-
-        ifa = symtab_fmt_name_lookup(istate->cr_ifa);
-        iipa = symtab_fmt_name_lookup(istate->cr_iipa);
-        iip = symtab_fmt_name_lookup(istate->cr_iip);
-
+static void dump_interrupted_context(istate_t *istate)
+{
+        const char *ifa = symtab_fmt_name_lookup(istate->cr_ifa);
+        const char *iipa = symtab_fmt_name_lookup(istate->cr_iipa);
+        const char *iip = symtab_fmt_name_lookup(istate->cr_iip);
+        
         putchar('\n');
         printf("Interrupted context dump:\n");
@@ -162 +157 @@
 void general_exception(uint64_t vector, istate_t *istate)
 {
-        char *desc = "";
-
+        const char *desc;
+        
         switch (istate->cr_isr.ge_code) {
         case GE_ILLEGALOP:
@@ -187 +182 @@
                 break;
         }
-
+        
         fault_if_from_uspace(istate, "General Exception (%s).", desc);
-
+        
         dump_interrupted_context(istate);
         panic("General Exception (%s).", desc);