Re: [PATCH] Rotate ChangeLog, fix build issues

[Keith Seitz <keiths@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 1777 bytes --]

On 04/08/2011 09:14 PM, Hui Zhu wrote:
> I am not sure, bug I got:
> gcc -g -O2   -I. -I../../src/gdb -I../../src/gdb/common
> -I../../src/gdb/config -DLOCALEDIR="\"/usr/local/share/locale\""
> -DHAVE_CONFIG_H -I../../src/gdb/../include/opcode
> -I../../src/gdb/../opcodes/.. -I../../src/gdb/../readline/.. -I../bfd
> -I../../src/gdb/../bfd -I../../src/gdb/../include -I../libdecnumber
> -I../../src/gdb/../libdecnumber  -I../../src/gdb/gnulib -Ignulib
> -DMI_OUT=1 -DTUI=1  -DGDBTK -I/usr/include/python2.6
> -I/usr/include/python2.6 -Wall -Wdeclaration-after-statement
> -Wpointer-arith -Wformat-nonliteral -Wno-pointer-sign -Wno-unused
> -Wunused-value -Wunused-function -Wno-switch -Wno-char-subscripts
> -Werror -c -o gdbtk-bp.o -MT gdbtk-bp.o -MMD -MP -MF
> .deps/gdbtk-bp.Tpo -I../../src/gdb/../libgui/src
> -I/home/teawater/gdb/cvs/src/tcl/generic
> -I/home/teawater/gdb/cvs/src/tk/generic
> -DGDBTK_LIBRARY=\"/usr/local/share/insight1.0\"
> -DSRC_DIR=\"/home/teawater/gdb/cvs/src/gdb\"
> ../../src/gdb/gdbtk/generic/gdbtk-bp.c
> ../../src/gdb/gdbtk/generic/gdbtk-bp.c: In function 'tracepoint_exists':
> ../../src/gdb/gdbtk/generic/gdbtk-bp.c:834: error: too many arguments
> to function 'decode_line_1'

Gah! *Another* change. I missed it because I haven't updated my working 
directory in a week.

I've committed the attached patch, which *should* fix it. Thank you for 
pointing that out.

Keith

ChangeLog
2011-04-08  Keith Seitz  <keiths@redhat.com>

	* generic/gdbtk-bp.c (tracepoint_exists): Remove recently
	removed "not_found_ptr" argument from call to decode_line_1.
	* generic/gdbtk-stack.c (gdb_get_vars_command): Likewise.
	* generic/gdbtk-cmds.c (gdb_get_line_command): Likewise.
	(gdb_get_file_command): Likewise.
	(gdb_get_function_command): Likewise.

[-- Attachment #2: insight-decode_line_1-not_found_ptr.patch --]
[-- Type: text/plain, Size: 2477 bytes --]

Index: generic/gdbtk-bp.c
===================================================================
RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk-bp.c,v
retrieving revision 1.39
diff -u -p -r1.39 gdbtk-bp.c
--- generic/gdbtk-bp.c	8 Apr 2011 23:32:42 -0000	1.39
+++ generic/gdbtk-bp.c	9 Apr 2011 04:24:26 -0000
@@ -831,7 +831,7 @@ tracepoint_exists (char *args)
   char *file = NULL;
   int result = -1;
 
-  sals = decode_line_1 (&args, 1, NULL, 0, NULL, NULL);
+  sals = decode_line_1 (&args, 1, NULL, 0, NULL);
   if (sals.nelts == 1)
     {
       resolve_sal_pc (&sals.sals[0]);
Index: generic/gdbtk-cmds.c
===================================================================
RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk-cmds.c,v
retrieving revision 1.119
diff -u -p -r1.119 gdbtk-cmds.c
--- generic/gdbtk-cmds.c	8 Apr 2011 23:32:42 -0000	1.119
+++ generic/gdbtk-cmds.c	9 Apr 2011 04:24:27 -0000
@@ -961,7 +961,7 @@ gdb_get_line_command (ClientData clientD
     }
 
   args = Tcl_GetStringFromObj (objv[1], NULL);
-  sals = decode_line_1 (&args, 1, NULL, 0, NULL, NULL);
+  sals = decode_line_1 (&args, 1, NULL, 0, NULL);
   if (sals.nelts == 1)
     {
       Tcl_SetIntObj (result_ptr->obj_ptr, sals.sals[0].line);
@@ -997,7 +997,7 @@ gdb_get_file_command (ClientData clientD
     }
 
   args = Tcl_GetStringFromObj (objv[1], NULL);
-  sals = decode_line_1 (&args, 1, NULL, 0, NULL, NULL);
+  sals = decode_line_1 (&args, 1, NULL, 0, NULL);
   if (sals.nelts == 1)
     {
       Tcl_SetStringObj (result_ptr->obj_ptr,
@@ -1033,7 +1033,7 @@ gdb_get_function_command (ClientData cli
     }
 
   args = Tcl_GetStringFromObj (objv[1], NULL);
-  sals = decode_line_1 (&args, 1, NULL, 0, NULL, NULL);
+  sals = decode_line_1 (&args, 1, NULL, 0, NULL);
   if (sals.nelts == 1)
     {
       resolve_sal_pc (&sals.sals[0]);
Index: generic/gdbtk-stack.c
===================================================================
RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk-stack.c,v
retrieving revision 1.35
diff -u -p -r1.35 gdbtk-stack.c
--- generic/gdbtk-stack.c	8 Apr 2011 23:32:42 -0000	1.35
+++ generic/gdbtk-stack.c	9 Apr 2011 04:24:27 -0000
@@ -298,7 +298,7 @@ gdb_get_vars_command (ClientData clientD
   if (objc == 2)
     {
       args = Tcl_GetStringFromObj (objv[1], NULL);
-      sals = decode_line_1 (&args, 1, NULL, 0, NULL, NULL);
+      sals = decode_line_1 (&args, 1, NULL, 0, NULL);
       if (sals.nelts == 0)
 	{
 	  gdbtk_set_result (interp, "error decoding line");