Changeset cddcc4a3 in mainline for kernel/generic/src/debug/symtab.c

Timestamp:

2012-08-14T18:16:39Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

669f5cae

Parents:

76d92db1 (diff), 4802dd7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• kernel/generic/src/debug/symtab.c (modified) (5 diffs)

kernel/generic/src/debug/symtab.c

@@ -210 +210 @@
  *
  */
-int symtab_compl(char *input, size_t size, indev_t * indev)
+int symtab_compl(char *input, size_t size, indev_t *indev)
 {
 #ifdef CONFIG_SYMTAB
@@ -227 +227 @@
         const char *hint;
         char output[MAX_SYMBOL_NAME];
-        /* Maximum Match Length : Length of longest matching common substring in
-           case more than one match is found */
+        
+        /*
+         * Maximum Match Length: Length of longest matching common substring in
+         * case more than one match is found.
+         */
         size_t max_match_len = size;
         size_t max_match_len_tmp = size;
@@ -238 +241 @@
         
         output[0] = 0;
-
-        while ((hint = symtab_search_one(name, &pos))) {
-                ++pos;
-        }
-
+        
+        while ((hint = symtab_search_one(name, &pos)))
+                pos++;
+        
         pos = 0;
         
@@ -253 +255 @@
         }
         
-        /* If possible completions are more than MAX_TAB_HINTS, ask user whether to display them or not. */
+        /*
+         * If the number of possible completions is more than MAX_TAB_HINTS,
+         * ask the user whether to display them or not.
+         */
         if (found > MAX_TAB_HINTS) {
                 printf("\n");
-                continue_showing_hints = console_prompt_display_all_hints(indev, found);
+                continue_showing_hints =
+                    console_prompt_display_all_hints(indev, found);
         }
         
@@ -265 +271 @@
                         sym_name = symbol_table[pos].symbol_name;
                         pos++;
-
-                        if (continue_showing_hints) { /* We are still showing hints */
+                        
+                        if (continue_showing_hints) {
+                                /* We are still showing hints */
                                 printf("%s\n", sym_name);
                                 --hints_to_show;
                                 ++total_hints_shown;
-
-                                if (hints_to_show == 0 && total_hints_shown != found) { /* Time to ask user to continue */
-                                        continue_showing_hints = console_prompt_more_hints(indev, &hints_to_show);
+                                
+                                if ((hints_to_show == 0) && (total_hints_shown != found)) {
+                                        /* Ask the user to continue */
+                                        continue_showing_hints =
+                                            console_prompt_more_hints(indev, &hints_to_show);
                                 }
                         }
-
-                        for(max_match_len_tmp = 0; output[max_match_len_tmp] == sym_name[input_len + max_match_len_tmp]
-                                        && max_match_len_tmp < max_match_len; ++max_match_len_tmp);
+                        
+                        for (max_match_len_tmp = 0;
+                            (output[max_match_len_tmp] ==
+                            sym_name[input_len + max_match_len_tmp]) &&
+                            (max_match_len_tmp < max_match_len); ++max_match_len_tmp);
+                        
                         max_match_len = max_match_len_tmp;
                 }
-                /* keep only the characters common in all completions */
+                
+                /* Keep only the characters common in all completions */
                 output[max_match_len] = 0;
         }