This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
[ob] Fix objc-lang.c ari problems
- From: Andrew Cagney <ac131313 at redhat dot com>
- To: gdb-patches at sources dot redhat dot com
- Date: Sun, 06 Apr 2003 15:26:10 -0400
- Subject: [ob] Fix objc-lang.c ari problems
FYI,
I've committed the attached cleanups.
Andrew
2003-04-06 Andrew Cagney <cagney at redhat dot com>
* valprint.h (inspect_it): Add extern declaration.
* objc-lang.c (value_nsstring): Avoid assignment inside of "if".
(selectors_info, classes_info): Ditto.
(find_objc_msgcall): Fix indentation.
(objc_printstr): Delete extern declarations.
Index: objc-lang.c
===================================================================
RCS file: /cvs/src/src/gdb/objc-lang.c,v
retrieving revision 1.16
diff -u -r1.16 objc-lang.c
--- objc-lang.c 4 Apr 2003 04:29:15 -0000 1.16
+++ objc-lang.c 6 Apr 2003 19:21:46 -0000
@@ -199,8 +199,10 @@
if (!target_has_execution)
return 0; /* Can't call into inferior to create NSString. */
- if (!(sym = lookup_struct_typedef("NSString", 0, 1)) &&
- !(sym = lookup_struct_typedef("NXString", 0, 1)))
+ sym = lookup_struct_typedef("NSString", 0, 1);
+ if (sym == NULL)
+ sym = lookup_struct_typedef("NXString", 0, 1);
+ if (sym == NULL)
type = lookup_pointer_type(builtin_type_void);
else
type = lookup_pointer_type(SYMBOL_TYPE (sym));
@@ -369,8 +371,6 @@
int in_quotes = 0;
int need_comma = 0;
extern int inspect_it;
- extern int repeat_count_threshold;
- extern int print_max;
/* If the string was not truncated due to `set print elements', and
the last byte of it is a null, we don't print that, in
@@ -890,8 +890,11 @@
}
if (regexp != NULL)
- if (0 != (val = re_comp (myregexp)))
- error ("Invalid regexp (%s): %s", val, regexp);
+ {
+ val = re_comp (myregexp);
+ if (val != 0)
+ error ("Invalid regexp (%s): %s", val, regexp);
+ }
/* First time thru is JUST to get max length and count. */
ALL_MSYMBOLS (objfile, msymbol)
@@ -1027,8 +1030,11 @@
}
if (regexp != NULL)
- if (0 != (val = re_comp (myregexp)))
- error ("Invalid regexp (%s): %s", val, regexp);
+ {
+ val = re_comp (myregexp);
+ if (val != 0)
+ error ("Invalid regexp (%s): %s", val, regexp);
+ }
/* First time thru is JUST to get max length and count. */
ALL_MSYMBOLS (objfile, msymbol)
@@ -1714,7 +1720,10 @@
unsigned int i;
find_objc_msgsend ();
- if (new_pc != NULL) { *new_pc = 0; }
+ if (new_pc != NULL)
+ {
+ *new_pc = 0;
+ }
for (i = 0; i < nmethcalls; i++)
if ((pc >= methcalls[i].begin) && (pc < methcalls[i].end))
Index: valprint.h
===================================================================
RCS file: /cvs/src/src/gdb/valprint.h,v
retrieving revision 1.3
diff -u -r1.3 valprint.h
--- valprint.h 21 Oct 2001 19:20:30 -0000 1.3
+++ valprint.h 6 Apr 2003 19:21:47 -0000
@@ -33,6 +33,12 @@
extern unsigned int print_max; /* Max # of chars for strings/vectors */
+/* Flag to low-level print routines that this value is being printed
+ in an epoch window. We'd like to pass this as a parameter, but
+ every routine would need to take it. Perhaps we can encapsulate
+ this in the I/O stream once we have GNU stdio. */
+extern int inspect_it;
+
/* Print repeat counts if there are more than this many repetitions of an
element in an array. Referenced by the low level language dependent
print routines. */