From fc9f3a697800953cffd597db86b65742e8cf5842 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 5 Jul 2011 20:30:19 +0000 Subject: [PATCH] * symtab.c (operator_chars): Now static. * linespec.c (operator_chars): Don't declare. --- gdb/ChangeLog | 5 +++++ gdb/linespec.c | 4 ---- gdb/symtab.c | 6 +----- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0cc6c4b0a78..a0b3d0b6db4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2011-07-05 Tom Tromey + + * symtab.c (operator_chars): Now static. + * linespec.c (operator_chars): Don't declare. + 2011-07-05 Thiago Jung Bauermann * ui-out.h (ui_out_field_core_addr): Fix typo in comment. diff --git a/gdb/linespec.c b/gdb/linespec.c index 61f43b669f7..137ef9cf7e7 100644 --- a/gdb/linespec.c +++ b/gdb/linespec.c @@ -44,10 +44,6 @@ #include #include "cli/cli-utils.h" -/* We share this one with symtab.c, but it is not exported widely. */ - -extern char *operator_chars (char *, char **); - /* Prototypes for local functions. */ static void initialize_defaults (struct symtab **default_symtab, diff --git a/gdb/symtab.c b/gdb/symtab.c index 5ece679eafa..b792081af37 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -83,10 +83,6 @@ static void output_source_filename (const char *, int *); static int find_line_common (struct linetable *, int, int *); -/* This one is used by linespec.c */ - -char *operator_chars (char *p, char **end); - static struct symbol *lookup_symbol_aux (const char *name, const struct block *block, const domain_enum domain, @@ -2637,7 +2633,7 @@ skip_prologue_sal (struct symtab_and_line *sal) some legitimate operator text, return a pointer to the beginning of the substring of the operator text. Otherwise, return "". */ -char * +static char * operator_chars (char *p, char **end) { *end = "";