gdb.base/{exprs,ptype,ptype1,setvar,whatis}.c C++ify

This adjusts:

 gdb.base/{exprs,ptype,ptype1,setvar,whatis}.c,

to make them buildable as C++ programs.

gdb/testsuite/ChangeLog:

	* gdb.base/exprs.c: Replace 'this' with 'self' throughout.
	* gdb.base/ptype.c: : Replace 'this' with 'self' throughout.
	(charfoo, intfoo): Define full prototype.
	* gdb.base/ptype1.c (charfoo): Define full prototype.
	* gdb.base/setvar.c: Replace 'this' with 'self' throughout.
	* gdb.base/whatis.c: Replace 'this' with 'self' throughout.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index a7caa79a4a209ba2f2ff59af209ac42b8e6fabf1..a97ac09c5e0fdb2cb06614e00278b41c66eddc56 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2020-09-17  Pedro Alves  <pedro@palves.net>
+
+       * gdb.base/exprs.c: Replace 'this' with 'self' throughout.
+       * gdb.base/ptype.c: : Replace 'this' with 'self' throughout.
+       (charfoo, intfoo): Define full prototype.
+       * gdb.base/ptype1.c (charfoo): Define full prototype.
+       * gdb.base/setvar.c: Replace 'this' with 'self' throughout.
+       * gdb.base/whatis.c: Replace 'this' with 'self' throughout.
+
 2020-09-17  Pedro Alves  <pedro@palves.net>
 
        * gdb.base/charset.c [__cplusplus] (wchar_t, char16_t, char32_t):

diff --git a/gdb/testsuite/gdb.base/exprs.c b/gdb/testsuite/gdb.base/exprs.c
index cd605f39d307b5dd4187b327c7f9b9d2483c6f3e..195b88e9142a805bd6f9274d79539b1f0894780c 100644 (file)
--- a/gdb/testsuite/gdb.base/exprs.c
+++ b/gdb/testsuite/gdb.base/exprs.c
@@ -156,7 +156,7 @@ double              v_double_func () { return (0.0); }
 struct link {
        struct link *next;
 #ifdef __STDC__
-       struct link *(*linkfunc) (struct link *this, int flags);
+       struct link *(*linkfunc) (struct link *self, int flags);
 #else
        struct link *(*linkfunc) ();
 #endif
@@ -166,7 +166,7 @@ struct link {
 union tu_link {
        struct link *next;
 #ifdef __STDC__
-       struct link *(*linkfunc) (struct link *this, int flags);
+       struct link *(*linkfunc) (struct link *self, int flags);
 #else
        struct link *(*linkfunc) ();
 #endif

diff --git a/gdb/testsuite/gdb.base/ptype.c b/gdb/testsuite/gdb.base/ptype.c
index 4148da771e180bcbb98d917a963dfc1444be5fde..6d12c2add423abaf4e0fcf3e1f4778c5c5cd9473 100644 (file)
--- a/gdb/testsuite/gdb.base/ptype.c
+++ b/gdb/testsuite/gdb.base/ptype.c
@@ -168,7 +168,7 @@ double              v_double_func () { return (0.0); }
 struct link {
        struct link *next;
 #ifdef __STDC__
-       struct link *(*linkfunc) (struct link *this, int flags);
+       struct link *(*linkfunc) (struct link *self, int flags);
 #else
        struct link *(*linkfunc) ();
 #endif
@@ -178,7 +178,7 @@ struct link {
 union tu_link {
        struct link *next;
 #ifdef __STDC__
-       struct link *(*linkfunc) (struct link *this, int flags);
+       struct link *(*linkfunc) (struct link *self, int flags);
 #else
        struct link *(*linkfunc) ();
 #endif
@@ -269,11 +269,11 @@ func_type v_func_type;
 
 /***********/
 
-extern char charfoo ();
+extern char charfoo (int);
 
 typedef int foo;
 
-foo intfoo (afoo)
+foo intfoo (int afoo)
 {
   charfoo (afoo);
   return (afoo * 2);

diff --git a/gdb/testsuite/gdb.base/ptype1.c b/gdb/testsuite/gdb.base/ptype1.c
index 25871509cba4806bdb243c9023a2e965d5360810..43ab05694e29e1ef61a0ea498ef8cc9dff8bcd3e 100644 (file)
--- a/gdb/testsuite/gdb.base/ptype1.c
+++ b/gdb/testsuite/gdb.base/ptype1.c
@@ -1,6 +1,6 @@
 typedef char foo;
 
-foo charfoo (afoo)
+foo charfoo (int afoo)
 {
   return (afoo * 2);
 }

diff --git a/gdb/testsuite/gdb.base/setvar.c b/gdb/testsuite/gdb.base/setvar.c
index 1b8d80886549d48ae73399095ec1dbb56d26ea29..415eb6f2aaa0436fd8b826a2c40daa47fbce8a75 100644 (file)
--- a/gdb/testsuite/gdb.base/setvar.c
+++ b/gdb/testsuite/gdb.base/setvar.c
@@ -161,7 +161,7 @@ double              v_double_func () { return (0.0); }
 struct link {
        struct link *next;
 #ifdef __STDC__
-       struct link *(*linkfunc) (struct link *this, int flags);
+       struct link *(*linkfunc) (struct link *self, int flags);
 #else
        struct link *(*linkfunc) ();
 #endif
@@ -171,7 +171,7 @@ struct link {
 union tu_link {
        struct link *next;
 #ifdef __STDC__
-       struct link *(*linkfunc) (struct link *this, int flags);
+       struct link *(*linkfunc) (struct link *self, int flags);
 #else
        struct link *(*linkfunc) ();
 #endif

diff --git a/gdb/testsuite/gdb.base/whatis.c b/gdb/testsuite/gdb.base/whatis.c
index 11c84d291cdd8de94708a8ff288485190bcf77fd..743cb61abfeb268ff74d2d924e54fe51dac48de9 100644 (file)
--- a/gdb/testsuite/gdb.base/whatis.c
+++ b/gdb/testsuite/gdb.base/whatis.c
@@ -207,7 +207,7 @@ double              v_double_func () { return (0.0); }
 struct link {
        struct link *next;
 #ifdef __STDC__
-       struct link *(*linkfunc) (struct link *this, int flags);
+       struct link *(*linkfunc) (struct link *self, int flags);
 #else
        struct link *(*linkfunc) ();
 #endif
@@ -217,7 +217,7 @@ struct link {
 union tu_link {
        struct link *next;
 #ifdef __STDC__
-       struct link *(*linkfunc) (struct link *this, int flags);
+       struct link *(*linkfunc) (struct link *self, int flags);
 #else
        struct link *(*linkfunc) ();
 #endif