import gdb-1999-06-28 snapshot

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.base / callfuncs.c

diff --git a/gdb/testsuite/gdb.base/callfuncs.c b/gdb/testsuite/gdb.base/callfuncs.c
index 56b9ba8153b6e293b7907497ead51853a76d75cb..ecf902657db609865d4994fe69895c7341e25911 100644 (file)
--- a/gdb/testsuite/gdb.base/callfuncs.c
+++ b/gdb/testsuite/gdb.base/callfuncs.c
@@ -8,6 +8,9 @@
 #define PARAMS(paramlist) paramlist
 #endif
 
+# include <stdlib.h>
+# include <string.h>
+
 char char_val1 = 'a';
 char char_val2 = 'b';
 
@@ -28,8 +31,8 @@ double double_val2 = -67.66;
 
 #define DELTA (0.001)
 
-char *string_val1 = "string 1";
-char *string_val2 = "string 2";
+char *string_val1 = (char *)"string 1";
+char *string_val2 = (char *)"string 2";
 
 char char_array_val1[] = "carray 1";
 char char_array_val2[] = "carray 2";
@@ -46,15 +49,20 @@ struct struct1 {
 
 /* Some functions that can be passed as arguments to other test
    functions, or called directly. */
-
-int add (a, b)
-int a, b;
+#ifdef PROTOTYPES
+int add (int a, int b)
+#else
+int add (a, b) int a, b;
+#endif
 {
   return (a + b);
 }
 
-int doubleit (a)
-int a;
+#ifdef PROTOTYPES
+int doubleit (int a)
+#else
+int doubleit (a) int a;
+#endif
 {
   return (a + a);
 }
@@ -69,20 +77,29 @@ enum enumtype enum_val1 = enumval1;
 enum enumtype enum_val2 = enumval2;
 enum enumtype enum_val3 = enumval3;
 
-int t_enum_value1 (enum_arg)
-enum enumtype enum_arg;
+#ifdef PROTOTYPES
+int t_enum_value1 (enum enumtype enum_arg)
+#else
+int t_enum_value1 (enum_arg) enum enumtype enum_arg;
+#endif
 {
   return (enum_arg == enum_val1);
 }
 
-int t_enum_value2 (enum_arg)
-enum enumtype enum_arg;
+#ifdef PROTOTYPES
+int t_enum_value2 (enum enumtype enum_arg)
+#else
+int t_enum_value2 (enum_arg) enum enumtype enum_arg;
+#endif
 {
   return (enum_arg == enum_val2);
 }
 
-int t_enum_value3 (enum_arg)
-enum enumtype enum_arg;
+#ifdef PROTOTYPES
+int t_enum_value3 (enum enumtype enum_arg)
+#else
+int t_enum_value3 (enum_arg) enum enumtype enum_arg;
+#endif
 {
   return (enum_arg == enum_val3);
 }
@@ -90,9 +107,11 @@ enum enumtype enum_arg;
 /* A function that takes a vector of integers (along with an explicit
    count) and returns their sum. */
 
-int sum_args (argc, argv)
-int argc;
-int argv[];
+#ifdef PROTOTYPES
+int sum_args (int argc, int argv[])
+#else
+int sum_args (argc, argv) int argc; int argv[];
+#endif
 {
   int sumval = 0;
   int idx;
@@ -107,6 +126,15 @@ int argv[];
 /* Test that we can call functions that take structs and return
    members from that struct */
 
+#ifdef PROTOTYPES
+char   t_structs_c (struct struct1 tstruct) { return (tstruct.c); }
+short  t_structs_s (struct struct1 tstruct) { return (tstruct.s); }
+int    t_structs_i (struct struct1 tstruct) { return (tstruct.i); }
+long   t_structs_l (struct struct1 tstruct) { return (tstruct.l); }
+float  t_structs_f (struct struct1 tstruct) { return (tstruct.f); }
+double t_structs_d (struct struct1 tstruct) { return (tstruct.d); }
+char  *t_structs_a (struct struct1 tstruct) { return (tstruct.a); }
+#else
 char   t_structs_c (tstruct) struct struct1 tstruct; { return (tstruct.c); }
 short  t_structs_s (tstruct) struct struct1 tstruct; { return (tstruct.s); }
 int    t_structs_i (tstruct) struct struct1 tstruct; { return (tstruct.i); }
@@ -114,19 +142,30 @@ long   t_structs_l (tstruct) struct struct1 tstruct; { return (tstruct.l); }
 float  t_structs_f (tstruct) struct struct1 tstruct; { return (tstruct.f); }
 double t_structs_d (tstruct) struct struct1 tstruct; { return (tstruct.d); }
 char  *t_structs_a (tstruct) struct struct1 tstruct; { return (tstruct.a); }
+#endif
 
 /* Test that calling functions works if there are a lot of arguments.  */
+#ifdef PROTOTYPES
+int
+sum10 (int i0, int i1, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9)
+#else
 int
 sum10 (i0, i1, i2, i3, i4, i5, i6, i7, i8, i9)
      int i0, i1, i2, i3, i4, i5, i6, i7, i8, i9;
+#endif
 {
   return i0 + i1 + i2 + i3 + i4 + i5 + i6 + i7 + i8 + i9;
 }
 
 /* Test that args are passed in the right order. */
+#ifdef PROTOTYPES
+int
+cmp10 (int i0, int i1, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9)
+#else
 int
 cmp10 (i0, i1, i2, i3, i4, i5, i6, i7, i8, i9)
   int i0, i1, i2, i3, i4, i5, i6, i7, i8, i9;
+#endif
 {
   return
     (i0 == 0) && (i1 == 1) && (i2 == 2) && (i3 == 3) && (i4 == 4) &&
@@ -152,14 +191,21 @@ int main ()
    either 0 or 1, depending upon whether the values were
    passed incorrectly or correctly, respectively. */
 
+#ifdef PROTOTYPES
+int t_char_values (char char_arg1, char char_arg2)
+#else
 int t_char_values (char_arg1, char_arg2)
 char char_arg1, char_arg2;
+#endif
 {
   return ((char_arg1 == char_val1) && (char_arg2 == char_val2));
 }
 
 int
-#ifdef NO_PROTOTYPES
+#ifdef PROTOTYPES
+t_small_values (char arg1, short arg2, int arg3, char arg4, short arg5,
+               char arg6, short arg7, int arg8, short arg9, short arg10)
+#else
 t_small_values (arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10)
      char arg1;
      short arg2;
@@ -171,34 +217,47 @@ t_small_values (arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10)
      int arg8;
      short arg9;
      short arg10;
-#else
-t_small_values (char arg1, short arg2, int arg3, char arg4, short arg5,
-               char arg6, short arg7, int arg8, short arg9, short arg10)
 #endif
 {
   return arg1 + arg2 + arg3 + arg4 + arg5 + arg6 + arg7 + arg8 + arg9 + arg10;
 }
 
+#ifdef PROTOTYPES
+int t_short_values (short short_arg1, short short_arg2)
+#else
 int t_short_values (short_arg1, short_arg2)
-short short_arg1, short_arg2;
+     short short_arg1, short_arg2;
+#endif
 {
   return ((short_arg1 == short_val1) && (short_arg2 == short_val2));
 }
 
+#ifdef PROTOTYPES
+int t_int_values (int int_arg1, int int_arg2)
+#else
 int t_int_values (int_arg1, int_arg2)
 int int_arg1, int_arg2;
+#endif
 {
   return ((int_arg1 == int_val1) && (int_arg2 == int_val2));
 }
 
+#ifdef PROTOTYPES
+int t_long_values (long long_arg1, long long_arg2)
+#else
 int t_long_values (long_arg1, long_arg2)
 long long_arg1, long_arg2;
+#endif
 {
   return ((long_arg1 == long_val1) && (long_arg2 == long_val2));
 }
 
+#ifdef PROTOTYPES
+int t_float_values (float float_arg1, float float_arg2)
+#else
 int t_float_values (float_arg1, float_arg2)
 float float_arg1, float_arg2;
+#endif
 {
   return ((float_arg1 - float_val1) < DELTA
          && (float_arg1 - float_val1) > -DELTA
@@ -207,13 +266,13 @@ float float_arg1, float_arg2;
 }
 
 int
-#ifdef NO_PROTOTYPES
+#ifdef PROTOTYPES
+t_float_values2 (float float_arg1, float float_arg2)
+#else
 /* In this case we are just duplicating t_float_values, but that is the
    easiest way to deal with either ANSI or non-ANSI.  */
 t_float_values2 (float_arg1, float_arg2)
      float float_arg1, float_arg2;
-#else
-t_float_values2 (float float_arg1, float float_arg2)
 #endif
 {
   return ((float_arg1 - float_val1) < DELTA
@@ -222,8 +281,12 @@ t_float_values2 (float float_arg1, float float_arg2)
          && (float_arg2 - float_val2) > -DELTA);
 }
 
+#ifdef PROTOTYPES
+int t_double_values (double double_arg1, double double_arg2)
+#else
 int t_double_values (double_arg1, double_arg2)
 double double_arg1, double_arg2;
+#endif
 {
   return ((double_arg1 - double_val1) < DELTA
          && (double_arg1 - double_val1) > -DELTA
@@ -231,15 +294,23 @@ double double_arg1, double_arg2;
          && (double_arg2 - double_val2) > -DELTA);
 }
 
+#ifdef PROTOTYPES
+int t_string_values (char *string_arg1, char *string_arg2)
+#else
 int t_string_values (string_arg1, string_arg2)
 char *string_arg1, *string_arg2;
+#endif
 {
   return (!strcmp (string_arg1, string_val1) &&
          !strcmp (string_arg2, string_val2));
 }
 
+#ifdef PROTOTYPES
+int t_char_array_values (char char_array_arg1[], char char_array_arg2[])
+#else
 int t_char_array_values (char_array_arg1, char_array_arg2)
 char char_array_arg1[], char_array_arg2[];
+#endif
 {
   return (!strcmp (char_array_arg1, char_array_val1) &&
          !strcmp (char_array_arg2, char_array_val2));
@@ -264,17 +335,25 @@ char char_array_arg1[], char_array_arg2[];
    that function indirectly through the function pointer.  This would fail
    on the HPPA.  */
 
+#ifdef PROTOTYPES
+int t_func_values (int (*func_arg1)(int, int), int (*func_arg2)(int))
+#else
 int t_func_values (func_arg1, func_arg2)
 int (*func_arg1) PARAMS ((int, int));
 int (*func_arg2) PARAMS ((int));
+#endif
 {
   return ((*func_arg1) (5,5)  == (*func_val1) (5,5)
           && (*func_arg2) (6) == (*func_val2) (6));
 }
 
+#ifdef PROTOTYPES
+int t_call_add (int (*func_arg1)(int, int), int a, int b)
+#else
 int t_call_add (func_arg1, a, b)
 int (*func_arg1) PARAMS ((int, int));
 int a, b;
+#endif
 {
   return ((*func_arg1)(a, b));
 }