xnu-1228.15.4.tar.gz

[apple/xnu.git] / osfmk / ddb / db_aout.c

diff --git a/osfmk/ddb/db_aout.c b/osfmk/ddb/db_aout.c
index d5eaab0cf3f8bd4d00250407510ab9dd2e63f385..b55857be5401a11f290fe660fdedde27a5fd72aa 100644 (file)
--- a/osfmk/ddb/db_aout.c
+++ b/osfmk/ddb/db_aout.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -133,37 +133,37 @@ aout_db_compare_symbols(
 
 int db_sorting_limit = 50000;
 
+extern boolean_t getsymtab(char *, vm_offset_t *, int *, vm_offset_t *,
+               vm_size_t *);
+
 boolean_t
 aout_db_sym_init(
        char *  symtab,         /* pointer to start of symbol table */
-       char *  esymtab,        /* pointer to end of string table,
+       __unused char *esymtab, /* pointer to end of string table,
                                   for checking - may be rounded up to
                                   integer boundary */
-       char *  name,
+       const char *name,
        char *  task_addr)      /* use for this task only */
 {
        struct nlist    *sym_start, *sym_end, *dbsym_start, *dbsym_end;
        struct nlist    *sp;
        char *strtab, *dbstrtab;
-       int     strlen;
+       int     db_strlen;
        char *estrtab, *dbestrtab;
        unsigned long   minsym = ~0;
        unsigned long   maxsym = 0;
        boolean_t       sorted;
        boolean_t       sorting;
-       extern boolean_t getsymtab(char *, 
-               vm_offset_t *, int *,
-               vm_offset_t *,  vm_size_t *);
        int nsyms;
 
 
        if (!getsymtab(symtab, 
                (vm_offset_t *)&sym_start, &nsyms, 
-               (vm_offset_t *)&strtab, (vm_size_t *)&strlen)) {
+               (vm_offset_t *)&strtab, (vm_size_t *)&db_strlen)) {
                return(FALSE);
        }
        sym_end = sym_start + nsyms;
-       estrtab = strtab + strlen;
+       estrtab = strtab + db_strlen;
        
 /*
  *     We haven't actually started up VM yet, so we can just steal some pages to 
@@ -177,7 +177,7 @@ aout_db_sym_init(
        bcopy(strtab, dbstrtab, (unsigned int)estrtab - (unsigned int)strtab);  /* Copy strings */
 
        dbsym_end = dbsym_start + nsyms;
-       dbestrtab = dbstrtab + strlen;
+       dbestrtab = dbstrtab + db_strlen;
 
        sorting = ((dbsym_end - dbsym_start) < db_sorting_limit);
        
@@ -185,7 +185,7 @@ aout_db_sym_init(
            register long strx;
            strx = sp->n_un.n_strx;
            if (strx != 0) {
-               if (strx > strlen) {
+               if (strx > db_strlen) {
                    sp->n_un.n_name = 0;
                    continue;
                }
@@ -204,7 +204,7 @@ aout_db_sym_init(
 
        if (sorting) {
                db_qsort((char *) dbsym_start, dbsym_end - dbsym_start,
-                        sizeof (struct nlist), aout_db_order_symbols);
+                        sizeof(struct nlist), aout_db_order_symbols);
                sorted = TRUE;
        } else
                sorted = FALSE;
@@ -369,7 +369,7 @@ aout_db_qualified_print_completion(
        struct nlist    *sp;
        struct nlist    *sp1;
        struct nlist    *ep;
-       struct nlist    *ep1;
+       struct nlist    *ep1 = NULL;
        struct nlist    *fp = 0;
        int             symlen;
        int             nsym = 0;
@@ -404,8 +404,9 @@ aout_db_qualified_print_completion(
                if (cur->n_other) {
                   if (sp1 == sp)
                        sp1 = cur;
-                  if (strcmp(&cur->n_un.n_name[cur->n_other - 1],
-                             &new->n_un.n_name[new->n_other - 1]) < 0)
+                  if (strncmp(&cur->n_un.n_name[cur->n_other - 1],
+                             &new->n_un.n_name[new->n_other - 1],
+                             symlen) < 0)
                        new = cur;
                   else
                        ep1 = cur;
@@ -682,8 +683,8 @@ aout_db_search_symbol(
            target.n_value = off;
            target.n_un.n_name = (char *) 0;
            target.n_other = (char) 0;
-           db_qsort_limit_search((char *) &target, (char **) &sp, (char **) &ep,
-                                 sizeof (struct nlist), aout_db_compare_symbols);
+           db_qsort_limit_search((char *)&target, (char **)&sp, (char **)&ep,
+                                 sizeof(struct nlist), aout_db_compare_symbols);
            first_pass = TRUE;
        }
 
@@ -744,7 +745,7 @@ aout_db_symbol_values(
 }
 
 #define X_DB_MAX_DIFF  8       /* maximum allowable diff at the end of line */
-extern int     db_search_maxoff;       /* maximum acceptable offset */
+extern unsigned int db_search_maxoff;  /* maximum acceptable offset */
 
 /*
  * search symbol by value
@@ -785,8 +786,8 @@ aout_db_search_by_addr(
                target.n_value = addr;
                target.n_un.n_name = (char *) 0;
                target.n_other = (char) 0;
-               db_qsort_limit_search((char *) &target, (char **) &sp,
-                                     (char **) &ep, sizeof (struct nlist),
+               db_qsort_limit_search((char *)&target, (char **)&sp,
+                                     (char **)&ep, sizeof(struct nlist),
                                      aout_db_compare_symbols);
                first_pass = TRUE;
        }
@@ -932,7 +933,7 @@ aout_db_search_by_addr(
 boolean_t
 aout_db_line_at_pc(
        db_symtab_t     *stab,
-       db_sym_t        sym,
+       __unused db_sym_t       sym,
        char            **file,
        int             *line,
        db_expr_t       pc)
@@ -948,14 +949,13 @@ aout_db_line_at_pc(
        return(found && func && *file);
 }
 
+extern struct mach_header _mh_execute_header;
 /*
  * Initialization routine for a.out files.
  */
 void
 aout_db_init(void)
 {
-       extern struct mach_header _mh_execute_header;
-
        aout_db_sym_init((char *) &_mh_execute_header,
                (char *)0, "mach", (char *)0);
 }