projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
[powerpc.git]
/
scripts
/
kallsyms.c
diff --git
a/scripts/kallsyms.c
b/scripts/kallsyms.c
index
8b809b2
..
1f11d84
100644
(file)
--- a/
scripts/kallsyms.c
+++ b/
scripts/kallsyms.c
@@
-24,14
+24,12
@@
*
*/
*
*/
-#define _GNU_SOURCE
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
-#define KSYM_NAME_LEN 12
7
+#define KSYM_NAME_LEN 12
8
struct sym_entry {
struct sym_entry {
@@
-254,7
+252,7
@@
static void write_src(void)
unsigned int i, k, off;
unsigned int best_idx[256];
unsigned int *markers;
unsigned int i, k, off;
unsigned int best_idx[256];
unsigned int *markers;
- char buf[KSYM_NAME_LEN
+1
];
+ char buf[KSYM_NAME_LEN];
printf("#include <asm/types.h>\n");
printf("#if BITS_PER_LONG == 64\n");
printf("#include <asm/types.h>\n");
printf("#if BITS_PER_LONG == 64\n");
@@
-378,6
+376,17
@@
static void build_initial_tok_table(void)
table_cnt = pos;
}
table_cnt = pos;
}
+static void *find_token(unsigned char *str, int len, unsigned char *token)
+{
+ int i;
+
+ for (i = 0; i < len - 1; i++) {
+ if (str[i] == token[0] && str[i+1] == token[1])
+ return &str[i];
+ }
+ return NULL;
+}
+
/* replace a given token in all the valid symbols. Use the sampled symbols
* to update the counts */
static void compress_symbols(unsigned char *str, int idx)
/* replace a given token in all the valid symbols. Use the sampled symbols
* to update the counts */
static void compress_symbols(unsigned char *str, int idx)
@@
-391,7
+400,7
@@
static void compress_symbols(unsigned char *str, int idx)
p1 = table[i].sym;
/* find the token on the symbol */
p1 = table[i].sym;
/* find the token on the symbol */
- p2 =
memmem(p1, len, str, 2
);
+ p2 =
find_token(p1, len, str
);
if (!p2) continue;
/* decrease the counts for this symbol's tokens */
if (!p2) continue;
/* decrease the counts for this symbol's tokens */
@@
-410,7
+419,7
@@
static void compress_symbols(unsigned char *str, int idx)
if (size < 2) break;
/* find the token on the symbol */
if (size < 2) break;
/* find the token on the symbol */
- p2 =
memmem(p1, size, str, 2
);
+ p2 =
find_token(p1, size, str
);
} while (p2);
} while (p2);