]> granicus.if.org Git - postgresql/commitdiff
Remove unnecessary parentheses in return statements
authorPeter Eisentraut <peter_e@gmx.net>
Thu, 17 Aug 2017 16:39:20 +0000 (12:39 -0400)
committerPeter Eisentraut <peter_e@gmx.net>
Tue, 5 Sep 2017 18:52:55 +0000 (14:52 -0400)
The parenthesized style has only been used in a few modules.  Change
that to use the style that is predominant across the whole tree.

Reviewed-by: Michael Paquier <michael.paquier@gmail.com>
Reviewed-by: Ryan Murphy <ryanfmurphy@gmail.com>
99 files changed:
contrib/btree_gist/btree_utils_num.c
contrib/btree_gist/btree_utils_var.c
contrib/cube/cube.c
contrib/dblink/dblink.c
contrib/intarray/_int_bool.c
contrib/ltree/ltxtquery_op.c
contrib/pgcrypto/crypt-des.c
contrib/pgstattuple/pgstatindex.c
contrib/seg/seg.c
contrib/spi/refint.c
contrib/spi/timetravel.c
doc/src/sgml/spi.sgml
src/backend/bootstrap/bootscanner.l
src/backend/tsearch/spell.c
src/backend/utils/adt/inet_cidr_ntop.c
src/backend/utils/adt/inet_net_pton.c
src/backend/utils/adt/tsgistidx.c
src/backend/utils/mb/Unicode/convutils.pm
src/backend/utils/mb/conversion_procs/euc_tw_and_big5/big5.c
src/interfaces/ecpg/compatlib/informix.c
src/interfaces/ecpg/ecpglib/connect.c
src/interfaces/ecpg/ecpglib/data.c
src/interfaces/ecpg/ecpglib/descriptor.c
src/interfaces/ecpg/ecpglib/error.c
src/interfaces/ecpg/ecpglib/execute.c
src/interfaces/ecpg/ecpglib/memory.c
src/interfaces/ecpg/ecpglib/misc.c
src/interfaces/ecpg/ecpglib/prepare.c
src/interfaces/ecpg/pgtypeslib/common.c
src/interfaces/ecpg/pgtypeslib/numeric.c
src/interfaces/ecpg/pgtypeslib/timestamp.c
src/interfaces/ecpg/preproc/ecpg.c
src/interfaces/ecpg/preproc/ecpg.header
src/interfaces/ecpg/preproc/pgc.l
src/interfaces/ecpg/preproc/type.c
src/interfaces/ecpg/preproc/variable.c
src/interfaces/ecpg/test/compat_informix/dec_test.pgc
src/interfaces/ecpg/test/compat_informix/describe.pgc
src/interfaces/ecpg/test/compat_informix/rfmtdate.pgc
src/interfaces/ecpg/test/compat_informix/rfmtlong.pgc
src/interfaces/ecpg/test/compat_informix/sqlda.pgc
src/interfaces/ecpg/test/connect/test1.pgc
src/interfaces/ecpg/test/connect/test2.pgc
src/interfaces/ecpg/test/connect/test3.pgc
src/interfaces/ecpg/test/connect/test4.pgc
src/interfaces/ecpg/test/connect/test5.pgc
src/interfaces/ecpg/test/expected/compat_informix-dec_test.c
src/interfaces/ecpg/test/expected/compat_informix-describe.c
src/interfaces/ecpg/test/expected/compat_informix-rfmtdate.c
src/interfaces/ecpg/test/expected/compat_informix-rfmtlong.c
src/interfaces/ecpg/test/expected/compat_informix-sqlda.c
src/interfaces/ecpg/test/expected/connect-test1.c
src/interfaces/ecpg/test/expected/connect-test2.c
src/interfaces/ecpg/test/expected/connect-test3.c
src/interfaces/ecpg/test/expected/connect-test4.c
src/interfaces/ecpg/test/expected/connect-test5.c
src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.c
src/interfaces/ecpg/test/expected/pgtypeslib-dt_test2.c
src/interfaces/ecpg/test/expected/pgtypeslib-nan_test.c
src/interfaces/ecpg/test/expected/pgtypeslib-num_test.c
src/interfaces/ecpg/test/expected/pgtypeslib-num_test2.c
src/interfaces/ecpg/test/expected/preproc-array_of_struct.c
src/interfaces/ecpg/test/expected/preproc-cursor.c
src/interfaces/ecpg/test/expected/preproc-define.c
src/interfaces/ecpg/test/expected/preproc-describe.c
src/interfaces/ecpg/test/expected/preproc-outofscope.c
src/interfaces/ecpg/test/expected/preproc-pointer_to_struct.c
src/interfaces/ecpg/test/expected/preproc-strings.c
src/interfaces/ecpg/test/expected/preproc-variable.c
src/interfaces/ecpg/test/expected/sql-array.c
src/interfaces/ecpg/test/expected/sql-describe.c
src/interfaces/ecpg/test/expected/sql-execute.c
src/interfaces/ecpg/test/expected/sql-oldexec.c
src/interfaces/ecpg/test/expected/sql-sqlda.c
src/interfaces/ecpg/test/expected/sql-twophase.c
src/interfaces/ecpg/test/expected/thread-thread.c
src/interfaces/ecpg/test/expected/thread-thread_implicit.c
src/interfaces/ecpg/test/performance/perftest.pgc
src/interfaces/ecpg/test/pgtypeslib/dt_test.pgc
src/interfaces/ecpg/test/pgtypeslib/dt_test2.pgc
src/interfaces/ecpg/test/pgtypeslib/nan_test.pgc
src/interfaces/ecpg/test/pgtypeslib/num_test.pgc
src/interfaces/ecpg/test/pgtypeslib/num_test2.pgc
src/interfaces/ecpg/test/preproc/array_of_struct.pgc
src/interfaces/ecpg/test/preproc/cursor.pgc
src/interfaces/ecpg/test/preproc/define.pgc
src/interfaces/ecpg/test/preproc/outofscope.pgc
src/interfaces/ecpg/test/preproc/pointer_to_struct.pgc
src/interfaces/ecpg/test/preproc/strings.pgc
src/interfaces/ecpg/test/preproc/variable.pgc
src/interfaces/ecpg/test/sql/array.pgc
src/interfaces/ecpg/test/sql/describe.pgc
src/interfaces/ecpg/test/sql/execute.pgc
src/interfaces/ecpg/test/sql/oldexec.pgc
src/interfaces/ecpg/test/sql/sqlda.pgc
src/interfaces/ecpg/test/sql/twophase.pgc
src/interfaces/ecpg/test/thread/thread.pgc
src/interfaces/ecpg/test/thread/thread_implicit.pgc
src/test/isolation/specscanner.l

index bae32c4064d4ff527af57c2506d13f62e1916b60..b2295f2c7d72fa2de7d2083f73944a405ada8216 100644 (file)
@@ -296,7 +296,7 @@ gbt_num_consistent(const GBT_NUMKEY_R *key,
                        retval = false;
        }
 
-       return (retval);
+       return retval;
 }
 
 
index 2c636ad2fa86f45b06709a28def2ac8a9a49ccd0..ecc87f3bb33edb9d4e3f33a2cdc274c283d25aba 100644 (file)
@@ -159,7 +159,7 @@ gbt_var_node_cp_len(const GBT_VARKEY *node, const gbtree_vinfo *tinfo)
                l--;
                i++;
        }
-       return (ml);                            /* lower == upper */
+       return ml;                              /* lower == upper */
 }
 
 
@@ -299,7 +299,7 @@ gbt_var_compress(GISTENTRY *entry, const gbtree_vinfo *tinfo)
        else
                retval = entry;
 
-       return (retval);
+       return retval;
 }
 
 
index 149558c76348951f29d08279474e19da2ca3a28b..0e968d1c7645214bc6aa53b1df25148c3505d4e6 100644 (file)
@@ -625,7 +625,7 @@ g_cube_leaf_consistent(NDBOX *key,
                default:
                        retval = FALSE;
        }
-       return (retval);
+       return retval;
 }
 
 bool
@@ -652,7 +652,7 @@ g_cube_internal_consistent(NDBOX *key,
                default:
                        retval = FALSE;
        }
-       return (retval);
+       return retval;
 }
 
 NDBOX *
@@ -663,7 +663,7 @@ g_cube_binary_union(NDBOX *r1, NDBOX *r2, int *sizep)
        retval = cube_union_v0(r1, r2);
        *sizep = VARSIZE(retval);
 
-       return (retval);
+       return retval;
 }
 
 
@@ -729,7 +729,7 @@ cube_union_v0(NDBOX *a, NDBOX *b)
                SET_POINT_BIT(result);
        }
 
-       return (result);
+       return result;
 }
 
 Datum
@@ -1058,7 +1058,7 @@ cube_contains_v0(NDBOX *a, NDBOX *b)
        int                     i;
 
        if ((a == NULL) || (b == NULL))
-               return (FALSE);
+               return FALSE;
 
        if (DIM(a) < DIM(b))
        {
@@ -1070,9 +1070,9 @@ cube_contains_v0(NDBOX *a, NDBOX *b)
                for (i = DIM(a); i < DIM(b); i++)
                {
                        if (LL_COORD(b, i) != 0)
-                               return (FALSE);
+                               return FALSE;
                        if (UR_COORD(b, i) != 0)
-                               return (FALSE);
+                               return FALSE;
                }
        }
 
@@ -1081,13 +1081,13 @@ cube_contains_v0(NDBOX *a, NDBOX *b)
        {
                if (Min(LL_COORD(a, i), UR_COORD(a, i)) >
                        Min(LL_COORD(b, i), UR_COORD(b, i)))
-                       return (FALSE);
+                       return FALSE;
                if (Max(LL_COORD(a, i), UR_COORD(a, i)) <
                        Max(LL_COORD(b, i), UR_COORD(b, i)))
-                       return (FALSE);
+                       return FALSE;
        }
 
-       return (TRUE);
+       return TRUE;
 }
 
 Datum
@@ -1128,7 +1128,7 @@ cube_overlap_v0(NDBOX *a, NDBOX *b)
        int                     i;
 
        if ((a == NULL) || (b == NULL))
-               return (FALSE);
+               return FALSE;
 
        /* swap the box pointers if needed */
        if (DIM(a) < DIM(b))
@@ -1143,21 +1143,21 @@ cube_overlap_v0(NDBOX *a, NDBOX *b)
        for (i = 0; i < DIM(b); i++)
        {
                if (Min(LL_COORD(a, i), UR_COORD(a, i)) > Max(LL_COORD(b, i), UR_COORD(b, i)))
-                       return (FALSE);
+                       return FALSE;
                if (Max(LL_COORD(a, i), UR_COORD(a, i)) < Min(LL_COORD(b, i), UR_COORD(b, i)))
-                       return (FALSE);
+                       return FALSE;
        }
 
        /* compare to zero those dimensions in (a) absent in (b) */
        for (i = DIM(b); i < DIM(a); i++)
        {
                if (Min(LL_COORD(a, i), UR_COORD(a, i)) > 0)
-                       return (FALSE);
+                       return FALSE;
                if (Max(LL_COORD(a, i), UR_COORD(a, i)) < 0)
-                       return (FALSE);
+                       return FALSE;
        }
 
-       return (TRUE);
+       return TRUE;
 }
 
 
@@ -1385,7 +1385,7 @@ distance_1D(double a1, double a2, double b1, double b2)
                return (Min(a1, a2) - Max(b1, b2));
 
        /* the rest are all sorts of intersections */
-       return (0.0);
+       return 0.0;
 }
 
 /* Test if a box is also a point */
index 3113b07ab8e8be25fb3c4320d6a6c3cfe821dc1e..7dc7716a3a9f009829ac746994496bb62f0db460 100644 (file)
@@ -2217,7 +2217,7 @@ get_sql_insert(Relation rel, int *pkattnums, int pknumatts, char **src_pkattvals
        }
        appendStringInfoChar(&buf, ')');
 
-       return (buf.data);
+       return buf.data;
 }
 
 static char *
@@ -2254,7 +2254,7 @@ get_sql_delete(Relation rel, int *pkattnums, int pknumatts, char **tgt_pkattvals
                        appendStringInfoString(&buf, " IS NULL");
        }
 
-       return (buf.data);
+       return buf.data;
 }
 
 static char *
@@ -2341,7 +2341,7 @@ get_sql_update(Relation rel, int *pkattnums, int pknumatts, char **src_pkattvals
                        appendStringInfoString(&buf, " IS NULL");
        }
 
-       return (buf.data);
+       return buf.data;
 }
 
 /*
@@ -2549,9 +2549,9 @@ getConnectionByName(const char *name)
                                                                                           key, HASH_FIND, NULL);
 
        if (hentry)
-               return (hentry->rconn);
+               return hentry->rconn;
 
-       return (NULL);
+       return NULL;
 }
 
 static HTAB *
index a18c64560679f380f1175479bc196a4cd58d7223..01e47c53d0655b350b587f07de43e7dcb1e83cfe 100644 (file)
@@ -245,7 +245,7 @@ checkcondition_arr(void *checkval, ITEM *item)
        {
                StopMiddle = StopLow + (StopHigh - StopLow) / 2;
                if (*StopMiddle == item->val)
-                       return (true);
+                       return true;
                else if (*StopMiddle < item->val)
                        StopLow = StopMiddle + 1;
                else
@@ -274,7 +274,7 @@ execute(ITEM *curitem, void *checkval, bool calcnot,
                return (*chkcond) (checkval, curitem);
        else if (curitem->val == (int32) '!')
        {
-               return (calcnot) ?
+               return calcnot ?
                        ((execute(curitem - 1, checkval, calcnot, chkcond)) ? false : true)
                        : true;
        }
index 1428c8b47806f2c84b0fa5530c8d0b2f80ca2db8..6e9dbc46906351fe9ce0befeb4057a5059520000 100644 (file)
@@ -26,7 +26,7 @@ ltree_execute(ITEM *curitem, void *checkval, bool calcnot, bool (*chkcond) (void
                return (*chkcond) (checkval, curitem);
        else if (curitem->val == (int32) '!')
        {
-               return (calcnot) ?
+               return calcnot ?
                        ((ltree_execute(curitem + 1, checkval, calcnot, chkcond)) ? false : true)
                        : true;
        }
index 60bdbb0c9120de88048458104149d008dc95c29b..ee3a0f216965bfded0a303d21b5a378ff272039b 100644 (file)
@@ -206,18 +206,18 @@ static inline int
 ascii_to_bin(char ch)
 {
        if (ch > 'z')
-               return (0);
+               return 0;
        if (ch >= 'a')
                return (ch - 'a' + 38);
        if (ch > 'Z')
-               return (0);
+               return 0;
        if (ch >= 'A')
                return (ch - 'A' + 12);
        if (ch > '9')
-               return (0);
+               return 0;
        if (ch >= '.')
                return (ch - '.');
-       return (0);
+       return 0;
 }
 
 static void
@@ -420,7 +420,7 @@ des_setkey(const char *key)
                 * (which is weak and has bad parity anyway) in order to simplify the
                 * starting conditions.
                 */
-               return (0);
+               return 0;
        }
        old_rawkey0 = rawkey0;
        old_rawkey1 = rawkey1;
@@ -479,7 +479,7 @@ des_setkey(const char *key)
                        | comp_maskr[6][(t1 >> 7) & 0x7f]
                        | comp_maskr[7][t1 & 0x7f];
        }
-       return (0);
+       return 0;
 }
 
 static int
@@ -500,7 +500,7 @@ do_des(uint32 l_in, uint32 r_in, uint32 *l_out, uint32 *r_out, int count)
        int                     round;
 
        if (count == 0)
-               return (1);
+               return 1;
        else if (count > 0)
        {
                /*
@@ -613,7 +613,7 @@ do_des(uint32 l_in, uint32 r_in, uint32 *l_out, uint32 *r_out, int count)
                | fp_maskr[5][(r >> 16) & 0xff]
                | fp_maskr[6][(r >> 8) & 0xff]
                | fp_maskr[7][r & 0xff];
-       return (0);
+       return 0;
 }
 
 static int
@@ -639,7 +639,7 @@ des_cipher(const char *in, char *out, long salt, int count)
 
        retval = do_des(rawl, rawr, &l_out, &r_out, count);
        if (retval)
-               return (retval);
+               return retval;
 
        buffer[0] = htonl(l_out);
        buffer[1] = htonl(r_out);
@@ -647,7 +647,7 @@ des_cipher(const char *in, char *out, long salt, int count)
        /* copy data to avoid assuming output is word-aligned */
        memcpy(out, buffer, sizeof(buffer));
 
-       return (retval);
+       return retval;
 }
 
 char *
@@ -680,7 +680,7 @@ px_crypt_des(const char *key, const char *setting)
                        key++;
        }
        if (des_setkey((char *) keybuf))
-               return (NULL);
+               return NULL;
 
 #ifndef DISABLE_XDES
        if (*setting == _PASSWORD_EFMT1)
@@ -711,7 +711,7 @@ px_crypt_des(const char *key, const char *setting)
                         * Encrypt the key with itself.
                         */
                        if (des_cipher((char *) keybuf, (char *) keybuf, 0L, 1))
-                               return (NULL);
+                               return NULL;
 
                        /*
                         * And XOR with the next 8 characters of the key.
@@ -721,7 +721,7 @@ px_crypt_des(const char *key, const char *setting)
                                *q++ ^= *key++ << 1;
 
                        if (des_setkey((char *) keybuf))
-                               return (NULL);
+                               return NULL;
                }
                StrNCpy(output, setting, 10);
 
@@ -767,7 +767,7 @@ px_crypt_des(const char *key, const char *setting)
         * Do it.
         */
        if (do_des(0L, 0L, &r0, &r1, count))
-               return (NULL);
+               return NULL;
 
        /*
         * Now encode the result...
@@ -790,5 +790,5 @@ px_crypt_des(const char *key, const char *setting)
        *p++ = _crypt_a64[l & 0x3f];
        *p = 0;
 
-       return (output);
+       return output;
 }
index 9365ba7e02cf73389d290aaa5324c3d038c984d2..75317b96a2f0c7df185419608e21063c0b9ce58e 100644 (file)
@@ -568,7 +568,7 @@ pgstatginindex_internal(Oid relid, FunctionCallInfo fcinfo)
        tuple = heap_form_tuple(tupleDesc, values, nulls);
        result = HeapTupleGetDatum(tuple);
 
-       return (result);
+       return result;
 }
 
 /* ------------------------------------------------------
index 4fc18130e19485b1160b98707a45bd1eb6a61450..e707b18fc67164b344212e81e1e96388da2e16fc 100644 (file)
@@ -528,7 +528,7 @@ gseg_binary_union(Datum r1, Datum r2, int *sizep)
        retval = DirectFunctionCall2(seg_union, r1, r2);
        *sizep = sizeof(SEG);
 
-       return (retval);
+       return retval;
 }
 
 
@@ -1040,7 +1040,7 @@ restore(char *result, float val, int n)
 
                /* ... this is not done yet. */
        }
-       return (strlen(result));
+       return strlen(result);
 }
 
 
@@ -1080,7 +1080,7 @@ significant_digits(char *s)
        }
 
        if (!n)
-               return (zeroes);
+               return zeroes;
 
-       return (n);
+       return n;
 }
index 46205c7613671049117e8b9995f350e4e5fe1528..70def95ac5e13fd9a9f9255938754306425b2b80 100644 (file)
@@ -636,5 +636,5 @@ find_plan(char *ident, EPlan **eplan, int *nplans)
        newp->splan = NULL;
        (*nplans)++;
 
-       return (newp);
+       return newp;
 }
index 2c66d888dfe1132adad55a8784c3bbfbb17e7b03..816cc549ae163cfff2db870ffa5111fd70426f7c 100644 (file)
@@ -517,7 +517,7 @@ findTTStatus(char *name)
 AbsoluteTime
 currabstime()
 {
-       return (GetCurrentAbsoluteTime());
+       return GetCurrentAbsoluteTime();
 }
 */
 
@@ -549,5 +549,5 @@ find_plan(char *ident, EPlan **eplan, int *nplans)
        newp->splan = NULL;
        (*nplans)++;
 
-       return (newp);
+       return newp;
 }
index d04b5a2125e45750936014b5a5a02425a2cfd4de..31535a307d1aa5cccdfdb6aebe17810af2ed2738 100644 (file)
@@ -4397,7 +4397,7 @@ execq(text *sql, int cnt)
     SPI_finish();
     pfree(command);
 
-    return (proc);
+    return proc;
 }
 </programlisting>
 
index 6467882fa37e199f88bbca28727eaea86f740a6d..51c5e5e3cd637d4b258a474bb7b7a9880d2f4243 100644 (file)
@@ -72,25 +72,25 @@ arrayid [A-Za-z0-9_]+\[{D}*\]
 
 %%
 
-open                   { return(OPEN); }
+open                   { return OPEN; }
 
-close                  { return(XCLOSE); }
+close                  { return XCLOSE; }
 
-create                 { return(XCREATE); }
+create                 { return XCREATE; }
 
-OID                            { return(OBJ_ID); }
-bootstrap              { return(XBOOTSTRAP); }
-"shared_relation"      { return(XSHARED_RELATION); }
-"without_oids" { return(XWITHOUT_OIDS); }
-"rowtype_oid"  { return(XROWTYPE_OID); }
-_null_                 { return(NULLVAL); }
+OID                            { return OBJ_ID; }
+bootstrap              { return XBOOTSTRAP; }
+"shared_relation"      { return XSHARED_RELATION; }
+"without_oids" { return XWITHOUT_OIDS; }
+"rowtype_oid"  { return XROWTYPE_OID; }
+_null_                 { return NULLVAL; }
 
-insert                 { return(INSERT_TUPLE); }
+insert                 { return INSERT_TUPLE; }
 
-","                            { return(COMMA); }
-"="                            { return(EQUALS); }
-"("                            { return(LPAREN); }
-")"                            { return(RPAREN); }
+","                            { return COMMA; }
+"="                            { return EQUALS; }
+"("                            { return LPAREN; }
+")"                            { return RPAREN; }
 
 [\n]                   { yyline++; }
 [\t]                   ;
@@ -99,31 +99,31 @@ insert                      { return(INSERT_TUPLE); }
 ^\#[^\n]* ; /* drop everything after "#" for comments */
 
 
-"declare"              { return(XDECLARE); }
-"build"                        { return(XBUILD); }
-"indices"              { return(INDICES); }
-"unique"               { return(UNIQUE); }
-"index"                        { return(INDEX); }
-"on"                   { return(ON); }
-"using"                        { return(USING); }
-"toast"                        { return(XTOAST); }
-"FORCE"                        { return(XFORCE); }
-"NOT"                  { return(XNOT); }
-"NULL"                 { return(XNULL); }
+"declare"              { return XDECLARE; }
+"build"                        { return XBUILD; }
+"indices"              { return INDICES; }
+"unique"               { return UNIQUE; }
+"index"                        { return INDEX; }
+"on"                   { return ON; }
+"using"                        { return USING; }
+"toast"                        { return XTOAST; }
+"FORCE"                        { return XFORCE; }
+"NOT"                  { return XNOT; }
+"NULL"                 { return XNULL; }
 
 {arrayid}              {
                                        yylval.str = MapArrayTypeName(yytext);
-                                       return(ID);
+                                       return ID;
                                }
 {id}                   {
                                        yylval.str = scanstr(yytext);
-                                       return(ID);
+                                       return ID;
                                }
 {sid}                  {
                                        yytext[strlen(yytext)-1] = '\0'; /* strip off quotes */
                                        yylval.str = scanstr(yytext+1);
                                        yytext[strlen(yytext)] = '"'; /* restore quotes */
-                                       return(ID);
+                                       return ID;
                                }
 
 .                              {
index 10202504905eabad481eb23028a71398130aacb3..6527c737314134436afac93fd00eda0404fb3799 100644 (file)
@@ -195,14 +195,14 @@ static char *VoidString = "";
 static int
 cmpspell(const void *s1, const void *s2)
 {
-       return (strcmp((*(SPELL *const *) s1)->word, (*(SPELL *const *) s2)->word));
+       return strcmp((*(SPELL *const *) s1)->word, (*(SPELL *const *) s2)->word);
 }
 
 static int
 cmpspellaffix(const void *s1, const void *s2)
 {
-       return (strcmp((*(SPELL *const *) s1)->p.flag,
-                                  (*(SPELL *const *) s2)->p.flag));
+       return strcmp((*(SPELL *const *) s1)->p.flag,
+                                  (*(SPELL *const *) s2)->p.flag);
 }
 
 static int
@@ -2240,9 +2240,9 @@ NormalizeSubWord(IspellDict *Conf, char *word, int flag)
        if (cur == forms)
        {
                pfree(forms);
-               return (NULL);
+               return NULL;
        }
-       return (forms);
+       return forms;
 }
 
 typedef struct SplitVar
index 2973d5665871a0e175084ba9611331d8237d86b9..30b3673789ff2e4e5f3eec1dbc811917262b7724 100644 (file)
@@ -58,12 +58,12 @@ inet_cidr_ntop(int af, const void *src, int bits, char *dst, size_t size)
        switch (af)
        {
                case PGSQL_AF_INET:
-                       return (inet_cidr_ntop_ipv4(src, bits, dst, size));
+                       return inet_cidr_ntop_ipv4(src, bits, dst, size);
                case PGSQL_AF_INET6:
-                       return (inet_cidr_ntop_ipv6(src, bits, dst, size));
+                       return inet_cidr_ntop_ipv6(src, bits, dst, size);
                default:
                        errno = EAFNOSUPPORT;
-                       return (NULL);
+                       return NULL;
        }
 }
 
@@ -92,7 +92,7 @@ inet_cidr_ntop_ipv4(const u_char *src, int bits, char *dst, size_t size)
        if (bits < 0 || bits > 32)
        {
                errno = EINVAL;
-               return (NULL);
+               return NULL;
        }
 
        if (bits == 0)
@@ -137,11 +137,11 @@ inet_cidr_ntop_ipv4(const u_char *src, int bits, char *dst, size_t size)
        if (size <= sizeof "/32")
                goto emsgsize;
        dst += SPRINTF((dst, "/%u", bits));
-       return (odst);
+       return odst;
 
 emsgsize:
        errno = EMSGSIZE;
-       return (NULL);
+       return NULL;
 }
 
 /*
@@ -182,7 +182,7 @@ inet_cidr_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size)
        if (bits < 0 || bits > 128)
        {
                errno = EINVAL;
-               return (NULL);
+               return NULL;
        }
 
        cp = outbuf;
@@ -286,9 +286,9 @@ inet_cidr_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size)
                goto emsgsize;
        strcpy(dst, outbuf);
 
-       return (dst);
+       return dst;
 
 emsgsize:
        errno = EMSGSIZE;
-       return (NULL);
+       return NULL;
 }
index be788d37cd070eadb3ceac8a1fc7cd4c532077e2..6f3ece1209c158fe3efef0f4ef15fcb2381ae524 100644 (file)
@@ -73,7 +73,7 @@ inet_net_pton(int af, const char *src, void *dst, size_t size)
                                inet_cidr_pton_ipv6(src, dst, size);
                default:
                        errno = EAFNOSUPPORT;
-                       return (-1);
+                       return -1;
        }
 }
 
@@ -228,15 +228,15 @@ inet_cidr_pton_ipv4(const char *src, u_char *dst, size_t size)
                        goto emsgsize;
                *dst++ = '\0';
        }
-       return (bits);
+       return bits;
 
 enoent:
        errno = ENOENT;
-       return (-1);
+       return -1;
 
 emsgsize:
        errno = EMSGSIZE;
-       return (-1);
+       return -1;
 }
 
 /*
@@ -338,11 +338,11 @@ inet_net_pton_ipv4(const char *src, u_char *dst)
 
 enoent:
        errno = ENOENT;
-       return (-1);
+       return -1;
 
 emsgsize:
        errno = EMSGSIZE;
-       return (-1);
+       return -1;
 }
 
 static int
@@ -363,19 +363,19 @@ getbits(const char *src, int *bitsp)
                if (pch != NULL)
                {
                        if (n++ != 0 && val == 0)       /* no leading zeros */
-                               return (0);
+                               return 0;
                        val *= 10;
                        val += (pch - digits);
                        if (val > 128)          /* range */
-                               return (0);
+                               return 0;
                        continue;
                }
-               return (0);
+               return 0;
        }
        if (n == 0)
-               return (0);
+               return 0;
        *bitsp = val;
-       return (1);
+       return 1;
 }
 
 static int
@@ -397,32 +397,32 @@ getv4(const char *src, u_char *dst, int *bitsp)
                if (pch != NULL)
                {
                        if (n++ != 0 && val == 0)       /* no leading zeros */
-                               return (0);
+                               return 0;
                        val *= 10;
                        val += (pch - digits);
                        if (val > 255)          /* range */
-                               return (0);
+                               return 0;
                        continue;
                }
                if (ch == '.' || ch == '/')
                {
                        if (dst - odst > 3) /* too many octets? */
-                               return (0);
+                               return 0;
                        *dst++ = val;
                        if (ch == '/')
-                               return (getbits(src, bitsp));
+                               return getbits(src, bitsp);
                        val = 0;
                        n = 0;
                        continue;
                }
-               return (0);
+               return 0;
        }
        if (n == 0)
-               return (0);
+               return 0;
        if (dst - odst > 3)                     /* too many octets? */
-               return (0);
+               return 0;
        *dst++ = val;
-       return (1);
+       return 1;
 }
 
 static int
@@ -552,13 +552,13 @@ inet_cidr_pton_ipv6(const char *src, u_char *dst, size_t size)
         */
        memcpy(dst, tmp, NS_IN6ADDRSZ);
 
-       return (bits);
+       return bits;
 
 enoent:
        errno = ENOENT;
-       return (-1);
+       return -1;
 
 emsgsize:
        errno = EMSGSIZE;
-       return (-1);
+       return -1;
 }
index 7ce2699b5c2d180855780394789e1ebc33d145bc..d8b86f63931ed1cf01b02a0a351ded94b6fba1fe 100644 (file)
@@ -317,14 +317,14 @@ checkcondition_arr(void *checkval, QueryOperand *val, ExecPhraseData *data)
        {
                StopMiddle = StopLow + (StopHigh - StopLow) / 2;
                if (*StopMiddle == val->valcrc)
-                       return (true);
+                       return true;
                else if (*StopMiddle < val->valcrc)
                        StopLow = StopMiddle + 1;
                else
                        StopHigh = StopMiddle;
        }
 
-       return (false);
+       return false;
 }
 
 static bool
index 43cadf5303b7e558b2b13a240df8236fb4d27521..22d02ca485f59bb5420a25abae2cd7ebe5f5ae8e 100644 (file)
@@ -812,7 +812,7 @@ sub ucs2utf
                  (((($ucs & 0x3ffff) >> 12) | 0x80) << 16) |
                  (((($ucs & 0x0fc0) >> 6) | 0x80) << 8) | (($ucs & 0x003f) | 0x80);
        }
-       return ($utf);
+       return $utf;
 }
 
 1;
index 1d9b10f8a7a9ab3db27514b3761c143bdcbb9e7e..68f76aa8cb82b5bb4d2ebd2b124970437806b960 100644 (file)
@@ -361,14 +361,14 @@ CNStoBIG5(unsigned short cns, unsigned char lc)
                        for (i = 0; i < sizeof(b2c3) / (sizeof(unsigned short) * 2); i++)
                        {
                                if (b2c3[i][1] == cns)
-                                       return (b2c3[i][0]);
+                                       return b2c3[i][0];
                        }
                        break;
                case LC_CNS11643_4:
                        for (i = 0; i < sizeof(b1c4) / (sizeof(unsigned short) * 2); i++)
                        {
                                if (b1c4[i][1] == cns)
-                                       return (b1c4[i][0]);
+                                       return b1c4[i][0];
                        }
                default:
                        break;
index 2508ed9b8f47b70e38b56cdbfcefa7a111e0ab13..e9bcb4cde2500b8bec65aa85c2b08a1beadf17c8 100644 (file)
@@ -79,7 +79,7 @@ deccall2(decimal *arg1, decimal *arg2, int (*ptr) (numeric *, numeric *))
        PGTYPESnumeric_free(a1);
        PGTYPESnumeric_free(a2);
 
-       return (i);
+       return i;
 }
 
 static int
@@ -143,7 +143,7 @@ deccall3(decimal *arg1, decimal *arg2, decimal *result, int (*ptr) (numeric *, n
        PGTYPESnumeric_free(a1);
        PGTYPESnumeric_free(a2);
 
-       return (i);
+       return i;
 }
 
 /* we start with the numeric functions */
@@ -166,7 +166,7 @@ decadd(decimal *arg1, decimal *arg2, decimal *sum)
 int
 deccmp(decimal *arg1, decimal *arg2)
 {
-       return (deccall2(arg1, arg2, PGTYPESnumeric_cmp));
+       return deccall2(arg1, arg2, PGTYPESnumeric_cmp);
 }
 
 void
@@ -261,7 +261,7 @@ deccvdbl(double dbl, decimal *np)
                result = PGTYPESnumeric_to_decimal(nres, np);
 
        PGTYPESnumeric_free(nres);
-       return (result);
+       return result;
 }
 
 int
@@ -283,7 +283,7 @@ deccvint(int in, decimal *np)
                result = PGTYPESnumeric_to_decimal(nres, np);
 
        PGTYPESnumeric_free(nres);
-       return (result);
+       return result;
 }
 
 int
@@ -305,7 +305,7 @@ deccvlong(long lng, decimal *np)
                result = PGTYPESnumeric_to_decimal(nres, np);
 
        PGTYPESnumeric_free(nres);
-       return (result);
+       return result;
 }
 
 int
@@ -598,7 +598,7 @@ rmdyjul(short mdy[3], date * d)
 int
 rdayofweek(date d)
 {
-       return (PGTYPESdate_dayofweek(d));
+       return PGTYPESdate_dayofweek(d);
 }
 
 /* And the datetime stuff */
@@ -1049,5 +1049,5 @@ rsetnull(int t, char *ptr)
 int
 risnull(int t, char *ptr)
 {
-       return (ECPGis_noind_null(t, ptr));
+       return ECPGis_noind_null(t, ptr);
 }
index 0716abdd7e13c1adbbfd3f7b2dc2b3b4e930f8e7..71fa2753638c83bed53127e279d406b03aa116e1 100644 (file)
@@ -67,7 +67,7 @@ ecpg_get_connection_nr(const char *connection_name)
                ret = con;
        }
 
-       return (ret);
+       return ret;
 }
 
 struct connection *
@@ -106,7 +106,7 @@ ecpg_get_connection(const char *connection_name)
 #endif
        }
 
-       return (ret);
+       return ret;
 }
 
 static void
@@ -168,7 +168,7 @@ ECPGsetcommit(int lineno, const char *mode, const char *connection_name)
        PGresult   *results;
 
        if (!ecpg_init(con, connection_name, lineno))
-               return (false);
+               return false;
 
        ecpg_log("ECPGsetcommit on line %d: action \"%s\"; connection \"%s\"\n", lineno, mode, con->name);
 
@@ -204,7 +204,7 @@ ECPGsetconn(int lineno, const char *connection_name)
        struct connection *con = ecpg_get_connection(connection_name);
 
        if (!ecpg_init(con, connection_name, lineno))
-               return (false);
+               return false;
 
 #ifdef ENABLE_THREAD_SAFETY
        pthread_setspecific(actual_connection_key, con);
@@ -675,7 +675,7 @@ ECPGdisconnect(int lineno, const char *connection_name)
        {
                ecpg_raise(lineno, ECPG_OUT_OF_MEMORY,
                                   ECPG_SQLSTATE_ECPG_OUT_OF_MEMORY, NULL);
-               return (false);
+               return false;
        }
 
 #ifdef ENABLE_THREAD_SAFETY
@@ -702,7 +702,7 @@ ECPGdisconnect(int lineno, const char *connection_name)
 #ifdef ENABLE_THREAD_SAFETY
                        pthread_mutex_unlock(&connections_mutex);
 #endif
-                       return (false);
+                       return false;
                }
                else
                        ecpg_finish(con);
index 5dbfded87333712cdac89ff2ea1f9efb0b516ed3..a2f3916f38246243d7e78510a276ecb87b5b769e 100644 (file)
@@ -134,7 +134,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
        {
                ecpg_raise(lineno, ECPG_OUT_OF_MEMORY,
                                   ECPG_SQLSTATE_ECPG_OUT_OF_MEMORY, NULL);
-               return (false);
+               return false;
        }
 
        /*
@@ -156,7 +156,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
                 * at least one tuple, but let's play it safe.
                 */
                ecpg_raise(lineno, ECPG_NOT_FOUND, ECPG_SQLSTATE_NO_DATA, NULL);
-               return (false);
+               return false;
        }
 
        /* We will have to decode the value */
@@ -204,7 +204,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
                                        ecpg_raise(lineno, ECPG_MISSING_INDICATOR,
                                                           ECPG_SQLSTATE_NULL_VALUE_NO_INDICATOR_PARAMETER,
                                                           NULL);
-                                       return (false);
+                                       return false;
                                }
                        }
                        break;
@@ -212,12 +212,12 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
                        ecpg_raise(lineno, ECPG_UNSUPPORTED,
                                           ECPG_SQLSTATE_ECPG_INTERNAL_ERROR,
                                           ecpg_type_name(ind_type));
-                       return (false);
+                       return false;
                        break;
        }
 
        if (value_for_indicator == -1)
-               return (true);
+               return true;
 
        /* let's check if it really is an array if it should be one */
        if (isarray == ECPG_ARRAY_ARRAY)
@@ -226,7 +226,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
                {
                        ecpg_raise(lineno, ECPG_DATA_NOT_ARRAY,
                                           ECPG_SQLSTATE_DATATYPE_MISMATCH, NULL);
-                       return (false);
+                       return false;
                }
 
                switch (type)
@@ -307,7 +307,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
                                        {
                                                ecpg_raise(lineno, ECPG_INT_FORMAT,
                                                                   ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
-                                               return (false);
+                                               return false;
                                        }
                                        pval = scan_length;
 
@@ -336,7 +336,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
                                        {
                                                ecpg_raise(lineno, ECPG_UINT_FORMAT,
                                                                   ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
-                                               return (false);
+                                               return false;
                                        }
                                        pval = scan_length;
 
@@ -364,7 +364,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
                                        if (garbage_left(isarray, scan_length, compat))
                                        {
                                                ecpg_raise(lineno, ECPG_INT_FORMAT, ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
-                                               return (false);
+                                               return false;
                                        }
                                        pval = scan_length;
 
@@ -376,7 +376,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
                                        if (garbage_left(isarray, scan_length, compat))
                                        {
                                                ecpg_raise(lineno, ECPG_UINT_FORMAT, ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
-                                               return (false);
+                                               return false;
                                        }
                                        pval = scan_length;
 
@@ -399,7 +399,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
                                        {
                                                ecpg_raise(lineno, ECPG_FLOAT_FORMAT,
                                                                   ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
-                                               return (false);
+                                               return false;
                                        }
                                        pval = scan_length;
 
@@ -438,7 +438,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 
                                        ecpg_raise(lineno, ECPG_CONVERT_BOOL,
                                                           ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
-                                       return (false);
+                                       return false;
                                        break;
 
                                case ECPGt_char:
@@ -581,14 +581,14 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
                                                        {
                                                                ecpg_raise(lineno, ECPG_OUT_OF_MEMORY,
                                                                                   ECPG_SQLSTATE_ECPG_OUT_OF_MEMORY, NULL);
-                                                               return (false);
+                                                               return false;
                                                        }
                                                }
                                                else
                                                {
                                                        ecpg_raise(lineno, ECPG_NUMERIC_FORMAT,
                                                                           ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
-                                                       return (false);
+                                                       return false;
                                                }
                                        }
                                        else
@@ -598,7 +598,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
                                                        free(nres);
                                                        ecpg_raise(lineno, ECPG_NUMERIC_FORMAT,
                                                                           ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
-                                                       return (false);
+                                                       return false;
                                                }
                                        }
                                        pval = scan_length;
@@ -635,7 +635,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
                                                         */
                                                        ires = (interval *) ecpg_alloc(sizeof(interval), lineno);
                                                        if (!ires)
-                                                               return (false);
+                                                               return false;
 
                                                        ECPGset_noind_null(ECPGt_interval, ires);
                                                }
@@ -643,7 +643,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
                                                {
                                                        ecpg_raise(lineno, ECPG_INTERVAL_FORMAT,
                                                                           ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
-                                                       return (false);
+                                                       return false;
                                                }
                                        }
                                        else
@@ -656,7 +656,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
                                                        free(ires);
                                                        ecpg_raise(lineno, ECPG_INTERVAL_FORMAT,
                                                                           ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
-                                                       return (false);
+                                                       return false;
                                                }
                                        }
                                        pval = scan_length;
@@ -693,7 +693,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
                                                {
                                                        ecpg_raise(lineno, ECPG_DATE_FORMAT,
                                                                           ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
-                                                       return (false);
+                                                       return false;
                                                }
                                        }
                                        else
@@ -705,7 +705,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
                                                {
                                                        ecpg_raise(lineno, ECPG_DATE_FORMAT,
                                                                           ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
-                                                       return (false);
+                                                       return false;
                                                }
                                        }
 
@@ -741,7 +741,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
                                                {
                                                        ecpg_raise(lineno, ECPG_TIMESTAMP_FORMAT,
                                                                           ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
-                                                       return (false);
+                                                       return false;
                                                }
                                        }
                                        else
@@ -753,7 +753,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
                                                {
                                                        ecpg_raise(lineno, ECPG_TIMESTAMP_FORMAT,
                                                                           ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
-                                                       return (false);
+                                                       return false;
                                                }
                                        }
 
@@ -765,7 +765,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
                                        ecpg_raise(lineno, ECPG_UNSUPPORTED,
                                                           ECPG_SQLSTATE_ECPG_INTERNAL_ERROR,
                                                           ecpg_type_name(type));
-                                       return (false);
+                                       return false;
                                        break;
                        }
                        if (ECPG_IS_ARRAY(isarray))
@@ -791,5 +791,5 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
                }
        } while (*pval != '\0' && !array_boundary(isarray, *pval));
 
-       return (true);
+       return true;
 }
index 1fa00b892f4def2a16449fb435f7c97fcbe1f171..bdd25184dca242e698105dee07f700fcd6ef43bd 100644 (file)
@@ -150,10 +150,10 @@ get_int_item(int lineno, void *var, enum ECPGttype vartype, int value)
                        break;
                default:
                        ecpg_raise(lineno, ECPG_VAR_NOT_NUMERIC, ECPG_SQLSTATE_RESTRICTED_DATA_TYPE_ATTRIBUTE_VIOLATION, NULL);
-                       return (false);
+                       return false;
        }
 
-       return (true);
+       return true;
 }
 
 static bool
@@ -195,7 +195,7 @@ set_int_item(int lineno, int *target, const void *var, enum ECPGttype vartype)
                        break;
                default:
                        ecpg_raise(lineno, ECPG_VAR_NOT_NUMERIC, ECPG_SQLSTATE_RESTRICTED_DATA_TYPE_ATTRIBUTE_VIOLATION, NULL);
-                       return (false);
+                       return false;
        }
 
        return true;
@@ -228,17 +228,17 @@ get_char_item(int lineno, void *var, enum ECPGttype vartype, char *value, int va
                        break;
                default:
                        ecpg_raise(lineno, ECPG_VAR_NOT_CHAR, ECPG_SQLSTATE_RESTRICTED_DATA_TYPE_ATTRIBUTE_VIOLATION, NULL);
-                       return (false);
+                       return false;
        }
 
-       return (true);
+       return true;
 }
 
 #define RETURN_IF_NO_DATA      if (ntuples < 1) \
                                { \
                                        va_end(args); \
                                        ecpg_raise(lineno, ECPG_NOT_FOUND, ECPG_SQLSTATE_NO_DATA, NULL); \
-                                       return (false); \
+                                       return false; \
                                }
 
 bool
@@ -265,7 +265,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
        if (!ECPGresult)
        {
                va_end(args);
-               return (false);
+               return false;
        }
 
        ntuples = PQntuples(ECPGresult);
@@ -274,7 +274,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
        {
                ecpg_raise(lineno, ECPG_INVALID_DESCRIPTOR_INDEX, ECPG_SQLSTATE_INVALID_DESCRIPTOR_INDEX, NULL);
                va_end(args);
-               return (false);
+               return false;
        }
 
        ecpg_log("ECPGget_desc: reading items for tuple %d\n", index);
@@ -333,7 +333,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
                                if (!get_char_item(lineno, var, vartype, PQfname(ECPGresult, index), varcharsize))
                                {
                                        va_end(args);
-                                       return (false);
+                                       return false;
                                }
 
                                ecpg_log("ECPGget_desc: NAME = %s\n", PQfname(ECPGresult, index));
@@ -343,7 +343,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
                                if (!get_int_item(lineno, var, vartype, 1))
                                {
                                        va_end(args);
-                                       return (false);
+                                       return false;
                                }
 
                                break;
@@ -352,7 +352,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
                                if (!get_int_item(lineno, var, vartype, 0))
                                {
                                        va_end(args);
-                                       return (false);
+                                       return false;
                                }
 
                                break;
@@ -361,7 +361,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
                                if (!get_int_item(lineno, var, vartype, (PQfmod(ECPGresult, index) - VARHDRSZ) & 0xffff))
                                {
                                        va_end(args);
-                                       return (false);
+                                       return false;
                                }
 
                                ecpg_log("ECPGget_desc: SCALE = %d\n", (PQfmod(ECPGresult, index) - VARHDRSZ) & 0xffff);
@@ -371,7 +371,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
                                if (!get_int_item(lineno, var, vartype, PQfmod(ECPGresult, index) >> 16))
                                {
                                        va_end(args);
-                                       return (false);
+                                       return false;
                                }
 
                                ecpg_log("ECPGget_desc: PRECISION = %d\n", PQfmod(ECPGresult, index) >> 16);
@@ -381,7 +381,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
                                if (!get_int_item(lineno, var, vartype, PQfsize(ECPGresult, index)))
                                {
                                        va_end(args);
-                                       return (false);
+                                       return false;
                                }
 
                                ecpg_log("ECPGget_desc: OCTET_LENGTH = %d\n", PQfsize(ECPGresult, index));
@@ -391,7 +391,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
                                if (!get_int_item(lineno, var, vartype, PQfmod(ECPGresult, index) - VARHDRSZ))
                                {
                                        va_end(args);
-                                       return (false);
+                                       return false;
                                }
 
                                ecpg_log("ECPGget_desc: LENGTH = %d\n", PQfmod(ECPGresult, index) - VARHDRSZ);
@@ -401,7 +401,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
                                if (!get_int_item(lineno, var, vartype, ecpg_dynamic_type(PQftype(ECPGresult, index))))
                                {
                                        va_end(args);
-                                       return (false);
+                                       return false;
                                }
 
                                ecpg_log("ECPGget_desc: TYPE = %d\n", ecpg_dynamic_type(PQftype(ECPGresult, index)));
@@ -411,7 +411,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
                                if (!get_int_item(lineno, var, vartype, ecpg_dynamic_type_DDT(PQftype(ECPGresult, index))))
                                {
                                        va_end(args);
-                                       return (false);
+                                       return false;
                                }
 
                                ecpg_log("ECPGget_desc: TYPE = %d\n", ecpg_dynamic_type_DDT(PQftype(ECPGresult, index)));
@@ -421,7 +421,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
                                if (!get_int_item(lineno, var, vartype, PQntuples(ECPGresult)))
                                {
                                        va_end(args);
-                                       return (false);
+                                       return false;
                                }
 
                                ecpg_log("ECPGget_desc: CARDINALITY = %d\n", PQntuples(ECPGresult));
@@ -462,7 +462,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
                                        if (!get_int_item(lineno, var, vartype, PQgetlength(ECPGresult, act_tuple, index)))
                                        {
                                                va_end(args);
-                                               return (false);
+                                               return false;
                                        }
                                        var = (char *) var + offset;
                                        ecpg_log("ECPGget_desc: RETURNED[%d] = %d\n", act_tuple, PQgetlength(ECPGresult, act_tuple, index));
@@ -473,7 +473,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
                                snprintf(type_str, sizeof(type_str), "%d", type);
                                ecpg_raise(lineno, ECPG_UNKNOWN_DESCRIPTOR_ITEM, ECPG_SQLSTATE_ECPG_INTERNAL_ERROR, type_str);
                                va_end(args);
-                               return (false);
+                               return false;
                }
 
                type = va_arg(args, enum ECPGdtype);
@@ -539,7 +539,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
                        if (!get_int_item(lineno, data_var.ind_value, data_var.ind_type, -PQgetisnull(ECPGresult, act_tuple, index)))
                        {
                                va_end(args);
-                               return (false);
+                               return false;
                        }
                        data_var.ind_value = (char *) data_var.ind_value + data_var.ind_offset;
                        ecpg_log("ECPGget_desc: INDICATOR[%d] = %d\n", act_tuple, -PQgetisnull(ECPGresult, act_tuple, index));
@@ -547,7 +547,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
        }
        sqlca->sqlerrd[2] = ntuples;
        va_end(args);
-       return (true);
+       return true;
 }
 
 #undef RETURN_IF_NO_DATA
index 77d6cc2dae75856efcd8b6ea507d820b0d3340c4..f34ae4afb8332d29f4b033eb2d986bd80ea762e7 100644 (file)
@@ -286,23 +286,23 @@ ecpg_check_PQresult(PGresult *results, int lineno, PGconn *connection, enum COMP
        {
                ecpg_log("ecpg_check_PQresult on line %d: no result - %s", lineno, PQerrorMessage(connection));
                ecpg_raise_backend(lineno, NULL, connection, compat);
-               return (false);
+               return false;
        }
 
        switch (PQresultStatus(results))
        {
 
                case PGRES_TUPLES_OK:
-                       return (true);
+                       return true;
                        break;
                case PGRES_EMPTY_QUERY:
                        /* do nothing */
                        ecpg_raise(lineno, ECPG_EMPTY, ECPG_SQLSTATE_ECPG_INTERNAL_ERROR, NULL);
                        PQclear(results);
-                       return (false);
+                       return false;
                        break;
                case PGRES_COMMAND_OK:
-                       return (true);
+                       return true;
                        break;
                case PGRES_NONFATAL_ERROR:
                case PGRES_FATAL_ERROR:
@@ -310,23 +310,23 @@ ecpg_check_PQresult(PGresult *results, int lineno, PGconn *connection, enum COMP
                        ecpg_log("ecpg_check_PQresult on line %d: bad response - %s", lineno, PQresultErrorMessage(results));
                        ecpg_raise_backend(lineno, results, connection, compat);
                        PQclear(results);
-                       return (false);
+                       return false;
                        break;
                case PGRES_COPY_OUT:
-                       return (true);
+                       return true;
                        break;
                case PGRES_COPY_IN:
                        ecpg_log("ecpg_check_PQresult on line %d: COPY IN data transfer in progress\n", lineno);
                        PQendcopy(connection);
                        PQclear(results);
-                       return (false);
+                       return false;
                        break;
                default:
                        ecpg_log("ecpg_check_PQresult on line %d: unknown execution status type\n",
                                         lineno);
                        ecpg_raise_backend(lineno, results, connection, compat);
                        PQclear(results);
-                       return (false);
+                       return false;
                        break;
        }
 }
index 03c55d35930cba90673239d0a9ef3d65b52446bf..50f831aa2b0c9edf9ccccf3176d780d10152c213 100644 (file)
@@ -58,7 +58,7 @@ quote_postgres(char *arg, bool quote, int lineno)
                buffer_len = 2 * length + 1;
                res = (char *) ecpg_alloc(buffer_len + 3, lineno);
                if (!res)
-                       return (res);
+                       return res;
                escaped_len = PQescapeString(res + 1, arg, buffer_len);
                if (length == escaped_len)
                {
@@ -151,13 +151,13 @@ ecpg_type_infocache_push(struct ECPGtype_information_cache **cache, int oid, enu
        = (struct ECPGtype_information_cache *) ecpg_alloc(sizeof(struct ECPGtype_information_cache), lineno);
 
        if (new_entry == NULL)
-               return (false);
+               return false;
 
        new_entry->oid = oid;
        new_entry->isarray = isarray;
        new_entry->next = *cache;
        *cache = new_entry;
-       return (true);
+       return true;
 }
 
 static enum ARRAY_TYPE
@@ -178,89 +178,89 @@ ecpg_is_type_an_array(int type, const struct statement *stmt, const struct varia
 
                /* populate cache with well known types to speed things up */
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), BOOLOID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), BYTEAOID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), CHAROID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), NAMEOID, not_an_array_in_ecpg, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), INT8OID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), INT2OID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), INT2VECTOROID, ECPG_ARRAY_VECTOR, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), INT4OID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), REGPROCOID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), TEXTOID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), OIDOID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), TIDOID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), XIDOID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), CIDOID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), OIDVECTOROID, ECPG_ARRAY_VECTOR, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), POINTOID, ECPG_ARRAY_VECTOR, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), LSEGOID, ECPG_ARRAY_VECTOR, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), PATHOID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), BOXOID, ECPG_ARRAY_VECTOR, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), POLYGONOID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), LINEOID, ECPG_ARRAY_VECTOR, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), FLOAT4OID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), FLOAT8OID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), ABSTIMEOID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), RELTIMEOID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), TINTERVALOID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), UNKNOWNOID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), CIRCLEOID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), CASHOID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), INETOID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), CIDROID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), BPCHAROID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), VARCHAROID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), DATEOID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), TIMEOID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), TIMESTAMPOID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), TIMESTAMPTZOID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), INTERVALOID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), TIMETZOID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), ZPBITOID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), VARBITOID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
                if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), NUMERICOID, ECPG_ARRAY_NONE, stmt->lineno))
-                       return (ECPG_ARRAY_ERROR);
+                       return ECPG_ARRAY_ERROR;
        }
 
        for (cache_entry = (stmt->connection->cache_head); cache_entry != NULL; cache_entry = cache_entry->next)
@@ -271,13 +271,13 @@ ecpg_is_type_an_array(int type, const struct statement *stmt, const struct varia
 
        array_query = (char *) ecpg_alloc(strlen("select typlen from pg_type where oid= and typelem<>0") + 11, stmt->lineno);
        if (array_query == NULL)
-               return (ECPG_ARRAY_ERROR);
+               return ECPG_ARRAY_ERROR;
 
        sprintf(array_query, "select typlen from pg_type where oid=%d and typelem<>0", type);
        query = PQexec(stmt->connection->connection, array_query);
        ecpg_free(array_query);
        if (!ecpg_check_PQresult(query, stmt->lineno, stmt->connection->connection, stmt->compat))
-               return (ECPG_ARRAY_ERROR);
+               return ECPG_ARRAY_ERROR;
        else if (PQresultStatus(query) == PGRES_TUPLES_OK)
        {
                if (PQntuples(query) == 0)
@@ -297,7 +297,7 @@ ecpg_is_type_an_array(int type, const struct statement *stmt, const struct varia
                PQclear(query);
        }
        else
-               return (ECPG_ARRAY_ERROR);
+               return ECPG_ARRAY_ERROR;
 
        ecpg_type_infocache_push(&(stmt->connection->cache_head), type, isarray, stmt->lineno);
        ecpg_log("ecpg_is_type_an_array on line %d: type (%d); C (%d); array (%s)\n", stmt->lineno, type, var->type, ECPG_IS_ARRAY(isarray) ? "yes" : "no");
@@ -1486,7 +1486,7 @@ ecpg_process_output(struct statement *stmt, bool clear_result)
        {
                ecpg_raise(stmt->lineno, ECPG_OUT_OF_MEMORY,
                                   ECPG_SQLSTATE_ECPG_OUT_OF_MEMORY, NULL);
-               return (false);
+               return false;
        }
 
        var = stmt->outlist;
@@ -1654,7 +1654,7 @@ ecpg_process_output(struct statement *stmt, bool clear_result)
                                        else if (!INFORMIX_MODE(stmt->compat))
                                        {
                                                ecpg_raise(stmt->lineno, ECPG_TOO_FEW_ARGUMENTS, ECPG_SQLSTATE_USING_CLAUSE_DOES_NOT_MATCH_TARGETS, NULL);
-                                               return (false);
+                                               return false;
                                        }
                                }
 
@@ -1830,7 +1830,7 @@ ecpg_do_prologue(int lineno, const int compat, const int force_indicator,
                {
                        ecpg_raise(lineno, ECPG_INVALID_STMT, ECPG_SQLSTATE_INVALID_SQL_STATEMENT_NAME, stmt->command);
                        ecpg_do_epilogue(stmt);
-                       return (false);
+                       return false;
                }
        }
 
index a7268bb0f6c472e6ac4b5d0846814fea1d402e17..dc548a4cdab3c1afbcca72259218ea73d395599f 100644 (file)
@@ -26,7 +26,7 @@ ecpg_alloc(long size, int lineno)
                return NULL;
        }
 
-       return (new);
+       return new;
 }
 
 char *
@@ -40,7 +40,7 @@ ecpg_realloc(void *ptr, long size, int lineno)
                return NULL;
        }
 
-       return (new);
+       return new;
 }
 
 char *
@@ -58,7 +58,7 @@ ecpg_strdup(const char *string, int lineno)
                return NULL;
        }
 
-       return (new);
+       return new;
 }
 
 /* keep a list of memory we allocated for the user */
index edd7302d546fa1293cb04accf07869041852767f..2084d7fe6065831c99dc355beb49eaf9819c2746 100644 (file)
@@ -110,7 +110,7 @@ ecpg_init(const struct connection *con, const char *connection_name, const int l
        {
                ecpg_raise(lineno, ECPG_OUT_OF_MEMORY, ECPG_SQLSTATE_ECPG_OUT_OF_MEMORY,
                                   NULL);
-               return (false);
+               return false;
        }
 
        ecpg_init_sqlca(sqlca);
@@ -118,10 +118,10 @@ ecpg_init(const struct connection *con, const char *connection_name, const int l
        {
                ecpg_raise(lineno, ECPG_NO_CONN, ECPG_SQLSTATE_CONNECTION_DOES_NOT_EXIST,
                                   connection_name ? connection_name : ecpg_gettext("NULL"));
-               return (false);
+               return false;
        }
 
-       return (true);
+       return true;
 }
 
 #ifdef ENABLE_THREAD_SAFETY
@@ -155,9 +155,9 @@ ECPGget_sqlca(void)
                ecpg_init_sqlca(sqlca);
                pthread_setspecific(sqlca_key, sqlca);
        }
-       return (sqlca);
+       return sqlca;
 #else
-       return (&sqlca);
+       return &sqlca;
 #endif
 }
 
@@ -167,7 +167,7 @@ ECPGstatus(int lineno, const char *connection_name)
        struct connection *con = ecpg_get_connection(connection_name);
 
        if (!ecpg_init(con, connection_name, lineno))
-               return (false);
+               return false;
 
        /* are we connected? */
        if (con->connection == NULL)
@@ -176,7 +176,7 @@ ECPGstatus(int lineno, const char *connection_name)
                return false;
        }
 
-       return (true);
+       return true;
 }
 
 PGTransactionStatusType
@@ -202,7 +202,7 @@ ECPGtrans(int lineno, const char *connection_name, const char *transaction)
        struct connection *con = ecpg_get_connection(connection_name);
 
        if (!ecpg_init(con, connection_name, lineno))
-               return (false);
+               return false;
 
        ecpg_log("ECPGtrans on line %d: action \"%s\"; connection \"%s\"\n", lineno, transaction, con ? con->name : "null");
 
@@ -419,10 +419,10 @@ ECPGis_noind_null(enum ECPGttype type, void *ptr)
                        break;
 #endif                                                 /* HAVE_LONG_LONG_INT */
                case ECPGt_float:
-                       return (_check(ptr, sizeof(float)));
+                       return _check(ptr, sizeof(float));
                        break;
                case ECPGt_double:
-                       return (_check(ptr, sizeof(double)));
+                       return _check(ptr, sizeof(double));
                        break;
                case ECPGt_varchar:
                        if (*(((struct ECPGgeneric_varchar *) ptr)->arr) == 0x00)
@@ -437,10 +437,10 @@ ECPGis_noind_null(enum ECPGttype type, void *ptr)
                                return true;
                        break;
                case ECPGt_interval:
-                       return (_check(ptr, sizeof(interval)));
+                       return _check(ptr, sizeof(interval));
                        break;
                case ECPGt_timestamp:
-                       return (_check(ptr, sizeof(timestamp)));
+                       return _check(ptr, sizeof(timestamp));
                        break;
                default:
                        break;
index 151aa80dc666afd5b458f1938a981798ac4c77e0..e76b645024efbd5d754a925657a6ec95cbb958bc 100644 (file)
@@ -42,7 +42,7 @@ isvarchar(unsigned char c)
        if (c >= 128)
                return true;
 
-       return (false);
+       return false;
 }
 
 static bool
@@ -371,7 +371,7 @@ SearchStmtCache(const char *ecpgQuery)
        if (entIx >= stmtCacheEntPerBucket)
                entNo = 0;
 
-       return (entNo);
+       return entNo;
 }
 
 /*
@@ -389,14 +389,14 @@ ecpg_freeStmtCacheEntry(int lineno, int compat, int entNo)        /* entry # to free */
 
        entry = &stmtCacheEntries[entNo];
        if (!entry->stmtID[0])          /* return if the entry isn't in use     */
-               return (0);
+               return 0;
 
        con = ecpg_get_connection(entry->connection);
 
        /* free the 'prepared_statement' list entry               */
        this = ecpg_find_prepared_statement(entry->stmtID, con, &prev);
        if (this && !deallocate_one(lineno, compat, con, prev, this))
-               return (-1);
+               return -1;
 
        entry->stmtID[0] = '\0';
 
@@ -407,7 +407,7 @@ ecpg_freeStmtCacheEntry(int lineno, int compat, int entNo)  /* entry # to free */
                entry->ecpgQuery = 0;
        }
 
-       return (entNo);
+       return entNo;
 }
 
 /*
@@ -450,7 +450,7 @@ AddStmtToCache(int lineno,          /* line # of statement          */
 
 /* 'entNo' is the entry to use - make sure its free                                                                            */
        if (ecpg_freeStmtCacheEntry(lineno, compat, entNo) < 0)
-               return (-1);
+               return -1;
 
 /* add the query to the entry                                                                                                                  */
        entry = &stmtCacheEntries[entNo];
@@ -460,7 +460,7 @@ AddStmtToCache(int lineno,          /* line # of statement          */
        entry->execs = 0;
        memcpy(entry->stmtID, stmtID, sizeof(entry->stmtID));
 
-       return (entNo);
+       return entNo;
 }
 
 /* handle cache and preparation of statements in auto-prepare mode */
@@ -487,7 +487,7 @@ ecpg_auto_prepare(int lineno, const char *connection_name, const int compat, cha
                prep = ecpg_find_prepared_statement(stmtID, con, NULL);
                /* This prepared name doesn't exist on this connection. */
                if (!prep && !prepare_common(lineno, con, stmtID, query))
-                       return (false);
+                       return false;
 
                *name = ecpg_strdup(stmtID, lineno);
        }
@@ -501,9 +501,9 @@ ecpg_auto_prepare(int lineno, const char *connection_name, const int compat, cha
                sprintf(stmtID, "ecpg%d", nextStmtID++);
 
                if (!ECPGprepare(lineno, connection_name, 0, stmtID, query))
-                       return (false);
+                       return false;
                if (AddStmtToCache(lineno, stmtID, connection_name, compat, query) < 0)
-                       return (false);
+                       return false;
 
                *name = ecpg_strdup(stmtID, lineno);
        }
@@ -511,5 +511,5 @@ ecpg_auto_prepare(int lineno, const char *connection_name, const int compat, cha
        /* increase usage counter */
        stmtCacheEntries[entNo].execs++;
 
-       return (true);
+       return true;
 }
index 9084fd06b4e051c93d816f903b900a538465200d..ae29b6c4ab85cee5ebc2c6053b1e1d11defab489 100644 (file)
@@ -12,7 +12,7 @@ pgtypes_alloc(long size)
 
        if (!new)
                errno = ENOMEM;
-       return (new);
+       return new;
 }
 
 char *
@@ -22,7 +22,7 @@ pgtypes_strdup(const char *str)
 
        if (!new)
                errno = ENOMEM;
-       return (new);
+       return new;
 }
 
 int
index a93d074de211bc5e9cbae519695ba1e9c6db35e8..a8619168ff8b0aa42de77337ac1f83574d00634d 100644 (file)
@@ -40,7 +40,7 @@ apply_typmod(numeric *var, long typmod)
 
        /* Do nothing if we have a default typmod (-1) */
        if (typmod < (long) (VARHDRSZ))
-               return (0);
+               return 0;
 
        typmod -= VARHDRSZ;
        precision = (typmod >> 16) & 0xffff;
@@ -100,7 +100,7 @@ apply_typmod(numeric *var, long typmod)
 
        var->rscale = scale;
        var->dscale = scale;
-       return (0);
+       return 0;
 }
 #endif
 
@@ -296,7 +296,7 @@ set_var_from_str(char *str, char **ptr, numeric *dest)
                dest->weight = 0;
 
        dest->rscale = dest->dscale;
-       return (0);
+       return 0;
 }
 
 
@@ -412,16 +412,16 @@ PGTYPESnumeric_from_asc(char *str, char **endptr)
        char      **ptr = (endptr != NULL) ? endptr : &realptr;
 
        if (!value)
-               return (NULL);
+               return NULL;
 
        ret = set_var_from_str(str, ptr, value);
        if (ret)
        {
                PGTYPESnumeric_free(value);
-               return (NULL);
+               return NULL;
        }
 
-       return (value);
+       return value;
 }
 
 char *
@@ -445,7 +445,7 @@ PGTYPESnumeric_to_asc(numeric *num, int dscale)
        /* get_str_from_var may change its argument */
        s = get_str_from_var(numcopy, dscale);
        PGTYPESnumeric_free(numcopy);
-       return (s);
+       return s;
 }
 
 /* ----------
index 78931399e69e2e7f285f8a28ba00e8fe61ae18f4..fa5b32ed9da401ccf5f85ef318ef9ebd306ef557 100644 (file)
@@ -224,14 +224,14 @@ PGTYPEStimestamp_from_asc(char *str, char **endptr)
        if (strlen(str) > MAXDATELEN)
        {
                errno = PGTYPES_TS_BAD_TIMESTAMP;
-               return (noresult);
+               return noresult;
        }
 
        if (ParseDateTime(str, lowstr, field, ftype, &nf, ptr) != 0 ||
                DecodeDateTime(field, ftype, nf, &dtype, tm, &fsec, 0) != 0)
        {
                errno = PGTYPES_TS_BAD_TIMESTAMP;
-               return (noresult);
+               return noresult;
        }
 
        switch (dtype)
@@ -240,7 +240,7 @@ PGTYPEStimestamp_from_asc(char *str, char **endptr)
                        if (tm2timestamp(tm, fsec, NULL, &result) != 0)
                        {
                                errno = PGTYPES_TS_BAD_TIMESTAMP;
-                               return (noresult);
+                               return noresult;
                        }
                        break;
 
@@ -258,11 +258,11 @@ PGTYPEStimestamp_from_asc(char *str, char **endptr)
 
                case DTK_INVALID:
                        errno = PGTYPES_TS_BAD_TIMESTAMP;
-                       return (noresult);
+                       return noresult;
 
                default:
                        errno = PGTYPES_TS_BAD_TIMESTAMP;
-                       return (noresult);
+                       return noresult;
        }
 
        /* AdjustTimestampForTypmod(&result, typmod); */
index bad0a667fc2bc32d24849a36c33861e746f85357..536185fa1c8f804240e191efbfa0f0edd4214f08 100644 (file)
@@ -137,7 +137,7 @@ main(int argc, char *const argv[])
        if (find_my_exec(argv[0], my_exec_path) < 0)
        {
                fprintf(stderr, _("%s: could not locate my own executable path\n"), argv[0]);
-               return (ILLEGAL_OPTION);
+               return ILLEGAL_OPTION;
        }
 
        if (argc > 1)
@@ -266,7 +266,7 @@ main(int argc, char *const argv[])
        {
                fprintf(stderr, _("%s: no input files specified\n"), progname);
                fprintf(stderr, _("Try \"%s --help\" for more information.\n"), argv[0]);
-               return (ILLEGAL_OPTION);
+               return ILLEGAL_OPTION;
        }
        else
        {
index 2562366bbedbd6183f266738f664e729e5e3a443..e28d7e694ddace259c73c31483e3b5b5f59d9d56 100644 (file)
@@ -142,7 +142,7 @@ cat2_str(char *str1, char *str2)
        strcat(res_str, str2);
        free(str1);
        free(str2);
-       return(res_str);
+       return res_str;
 }
 
 static char *
@@ -162,7 +162,7 @@ cat_str(int count, ...)
 
        va_end(args);
 
-       return(res_str);
+       return res_str;
 }
 
 static char *
@@ -174,7 +174,7 @@ make2_str(char *str1, char *str2)
        strcat(res_str, str2);
        free(str1);
        free(str2);
-       return(res_str);
+       return res_str;
 }
 
 static char *
@@ -188,7 +188,7 @@ make3_str(char *str1, char *str2, char *str3)
        free(str1);
        free(str2);
        free(str3);
-       return(res_str);
+       return res_str;
 }
 
 /* and the rest */
@@ -233,7 +233,7 @@ create_questionmarks(char *name, bool array)
        /* removed the trailing " ," */
 
        result[strlen(result)-3] = '\0';
-       return(result);
+       return result;
 }
 
 static char *
index 3598a200d0db431541ad1fb90c1950ebfc77f4ed..fc450f30ab4fcea3b53e552c4fc57d8521f4cc7d 100644 (file)
@@ -768,7 +768,7 @@ cppline                     {space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
                                        }
 <SQL>:{identifier}((("->"|\.){identifier})|(\[{array}\]))*     {
                                                base_yylval.str = mm_strdup(yytext+1);
-                                               return(CVARIABLE);
+                                               return CVARIABLE;
                                        }
 <SQL>{identifier}      {
                                                const ScanKeyword  *keyword;
@@ -832,7 +832,7 @@ cppline                     {space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
                                                else
                                                {
                                                        base_yylval.str = mm_strdup(yytext);
-                                                       return(CPP_LINE);
+                                                       return CPP_LINE;
                                                }
                                        }
 <C>{cppinclude_next}           {
@@ -844,12 +844,12 @@ cppline                   {space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
                                                else
                                                {
                                                        base_yylval.str = mm_strdup(yytext);
-                                                       return(CPP_LINE);
+                                                       return CPP_LINE;
                                                }
                                        }
 <C,SQL>{cppline}       {
                                                base_yylval.str = mm_strdup(yytext);
-                                               return(CPP_LINE);
+                                               return CPP_LINE;
                                        }
 <C>{identifier}                {
                                                const ScanKeyword               *keyword;
@@ -879,38 +879,38 @@ cppline                   {space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
                                                }
                                        }
 <C>{xcstop}                    { mmerror(PARSE_ERROR, ET_ERROR, "nested /* ... */ comments"); }
-<C>":"                         { return(':'); }
-<C>";"                         { return(';'); }
-<C>","                         { return(','); }
-<C>"*"                         { return('*'); }
-<C>"%"                         { return('%'); }
-<C>"/"                         { return('/'); }
-<C>"+"                         { return('+'); }
-<C>"-"                         { return('-'); }
-<C>"("                         { parenths_open++; return('('); }
-<C>")"                         { parenths_open--; return(')'); }
+<C>":"                         { return ':'; }
+<C>";"                         { return ';'; }
+<C>","                         { return ','; }
+<C>"*"                         { return '*'; }
+<C>"%"                         { return '%'; }
+<C>"/"                         { return '/'; }
+<C>"+"                         { return '+'; }
+<C>"-"                         { return '-'; }
+<C>"("                         { parenths_open++; return '('; }
+<C>")"                         { parenths_open--; return ')'; }
 <C,xskip>{space}               { ECHO; }
-<C>\{                          { return('{'); }
-<C>\}                          { return('}'); }
-<C>\[                          { return('['); }
-<C>\]                          { return(']'); }
-<C>\=                          { return('='); }
-<C>"->"                                { return(S_MEMBER); }
-<C>">>"                                { return(S_RSHIFT); }
-<C>"<<"                                { return(S_LSHIFT); }
-<C>"||"                                { return(S_OR); }
-<C>"&&"                                { return(S_AND); }
-<C>"++"                                { return(S_INC); }
-<C>"--"                                { return(S_DEC); }
-<C>"=="                                { return(S_EQUAL); }
-<C>"!="                                { return(S_NEQUAL); }
-<C>"+="                                { return(S_ADD); }
-<C>"-="                                { return(S_SUB); }
-<C>"*="                                { return(S_MUL); }
-<C>"/="                                { return(S_DIV); }
-<C>"%="                                { return(S_MOD); }
-<C>"->*"                       { return(S_MEMPOINT); }
-<C>".*"                                { return(S_DOTPOINT); }
+<C>\{                          { return '{'; }
+<C>\}                          { return '}'; }
+<C>\[                          { return '['; }
+<C>\]                          { return ']'; }
+<C>\=                          { return '='; }
+<C>"->"                                { return S_MEMBER; }
+<C>">>"                                { return S_RSHIFT; }
+<C>"<<"                                { return S_LSHIFT; }
+<C>"||"                                { return S_OR; }
+<C>"&&"                                { return S_AND; }
+<C>"++"                                { return S_INC; }
+<C>"--"                                { return S_DEC; }
+<C>"=="                                { return S_EQUAL; }
+<C>"!="                                { return S_NEQUAL; }
+<C>"+="                                { return S_ADD; }
+<C>"-="                                { return S_SUB; }
+<C>"*="                                { return S_MUL; }
+<C>"/="                                { return S_DIV; }
+<C>"%="                                { return S_MOD; }
+<C>"->*"                       { return S_MEMPOINT; }
+<C>".*"                                { return S_DOTPOINT; }
 <C>{other}                     { return S_ANYTHING; }
 <C>{exec_sql}{define}{space}*  { BEGIN(def_ident); }
 <C>{informix_special}{define}{space}*  {
@@ -922,7 +922,7 @@ cppline                     {space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
                                                else
                                                {
                                                        yyless(1);
-                                                       return (S_ANYTHING);
+                                                       return S_ANYTHING;
                                                }
                                        }
 <C>{exec_sql}{undef}{space}*           { BEGIN(undef); }
@@ -935,7 +935,7 @@ cppline                     {space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
                                                else
                                                {
                                                        yyless(1);
-                                                       return (S_ANYTHING);
+                                                       return S_ANYTHING;
                                                }
                                        }
 <undef>{identifier}{space}*";" {
@@ -984,7 +984,7 @@ cppline                     {space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
                                          else
                                          {
                                                  yyless(1);
-                                                 return (S_ANYTHING);
+                                                 return S_ANYTHING;
                                          }
                                        }
 <C,xskip>{exec_sql}{ifdef}{space}*     { ifcond = TRUE; BEGIN(xcond); }
@@ -998,7 +998,7 @@ cppline                     {space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
                                          else
                                          {
                                                  yyless(1);
-                                                 return (S_ANYTHING);
+                                                 return S_ANYTHING;
                                          }
                                        }
 <C,xskip>{exec_sql}{ifndef}{space}* { ifcond = FALSE; BEGIN(xcond); }
@@ -1012,7 +1012,7 @@ cppline                   {space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
                                          else
                                          {
                                                  yyless(1);
-                                                 return (S_ANYTHING);
+                                                 return S_ANYTHING;
                                          }
                                        }
 <C,xskip>{exec_sql}{elif}{space}*      {       /* pop stack */
@@ -1043,7 +1043,7 @@ cppline                   {space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
                                        else
                                        {
                                                yyless(1);
-                                               return (S_ANYTHING);
+                                               return S_ANYTHING;
                                        }
                                }
 
@@ -1085,7 +1085,7 @@ cppline                   {space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
                                        else
                                        {
                                                yyless(1);
-                                               return (S_ANYTHING);
+                                               return S_ANYTHING;
                                        }
                                }
 <C,xskip>{exec_sql}{endif}{space}*";" {
@@ -1116,7 +1116,7 @@ cppline                   {space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
                                        else
                                        {
                                                yyless(1);
-                                               return (S_ANYTHING);
+                                               return S_ANYTHING;
                                        }
                                }
 
index 750cdf9c7ce6039d4415650bfb7fcb27cbbecb16..256a3c395c5509d338ab6980ccc8cf04ed290565 100644 (file)
@@ -69,7 +69,7 @@ ECPGstruct_member_dup(struct ECPGstruct_member *rm)
                rm = rm->next;
        }
 
-       return (new);
+       return new;
 }
 
 /* The NAME argument is copied. The type argument is preserved as a pointer. */
@@ -135,78 +135,78 @@ get_type(enum ECPGttype type)
        switch (type)
        {
                case ECPGt_char:
-                       return ("ECPGt_char");
+                       return "ECPGt_char";
                        break;
                case ECPGt_unsigned_char:
-                       return ("ECPGt_unsigned_char");
+                       return "ECPGt_unsigned_char";
                        break;
                case ECPGt_short:
-                       return ("ECPGt_short");
+                       return "ECPGt_short";
                        break;
                case ECPGt_unsigned_short:
-                       return ("ECPGt_unsigned_short");
+                       return "ECPGt_unsigned_short";
                        break;
                case ECPGt_int:
-                       return ("ECPGt_int");
+                       return "ECPGt_int";
                        break;
                case ECPGt_unsigned_int:
-                       return ("ECPGt_unsigned_int");
+                       return "ECPGt_unsigned_int";
                        break;
                case ECPGt_long:
-                       return ("ECPGt_long");
+                       return "ECPGt_long";
                        break;
                case ECPGt_unsigned_long:
-                       return ("ECPGt_unsigned_long");
+                       return "ECPGt_unsigned_long";
                        break;
                case ECPGt_long_long:
-                       return ("ECPGt_long_long");
+                       return "ECPGt_long_long";
                        break;
                case ECPGt_unsigned_long_long:
-                       return ("ECPGt_unsigned_long_long");
+                       return "ECPGt_unsigned_long_long";
                        break;
                case ECPGt_float:
-                       return ("ECPGt_float");
+                       return "ECPGt_float";
                        break;
                case ECPGt_double:
-                       return ("ECPGt_double");
+                       return "ECPGt_double";
                        break;
                case ECPGt_bool:
-                       return ("ECPGt_bool");
+                       return "ECPGt_bool";
                        break;
                case ECPGt_varchar:
-                       return ("ECPGt_varchar");
+                       return "ECPGt_varchar";
                case ECPGt_NO_INDICATOR:        /* no indicator */
-                       return ("ECPGt_NO_INDICATOR");
+                       return "ECPGt_NO_INDICATOR";
                        break;
                case ECPGt_char_variable:       /* string that should not be quoted */
-                       return ("ECPGt_char_variable");
+                       return "ECPGt_char_variable";
                        break;
                case ECPGt_const:               /* constant string quoted */
-                       return ("ECPGt_const");
+                       return "ECPGt_const";
                        break;
                case ECPGt_decimal:
-                       return ("ECPGt_decimal");
+                       return "ECPGt_decimal";
                        break;
                case ECPGt_numeric:
-                       return ("ECPGt_numeric");
+                       return "ECPGt_numeric";
                        break;
                case ECPGt_interval:
-                       return ("ECPGt_interval");
+                       return "ECPGt_interval";
                        break;
                case ECPGt_descriptor:
-                       return ("ECPGt_descriptor");
+                       return "ECPGt_descriptor";
                        break;
                case ECPGt_sqlda:
-                       return ("ECPGt_sqlda");
+                       return "ECPGt_sqlda";
                        break;
                case ECPGt_date:
-                       return ("ECPGt_date");
+                       return "ECPGt_date";
                        break;
                case ECPGt_timestamp:
-                       return ("ECPGt_timestamp");
+                       return "ECPGt_timestamp";
                        break;
                case ECPGt_string:
-                       return ("ECPGt_string");
+                       return "ECPGt_string";
                        break;
                default:
                        mmerror(PARSE_ERROR, ET_ERROR, "unrecognized variable type code %d", type);
@@ -674,51 +674,51 @@ get_dtype(enum ECPGdtype type)
        switch (type)
        {
                case ECPGd_count:
-                       return ("ECPGd_countr");
+                       return "ECPGd_countr";
                        break;
                case ECPGd_data:
-                       return ("ECPGd_data");
+                       return "ECPGd_data";
                        break;
                case ECPGd_di_code:
-                       return ("ECPGd_di_code");
+                       return "ECPGd_di_code";
                        break;
                case ECPGd_di_precision:
-                       return ("ECPGd_di_precision");
+                       return "ECPGd_di_precision";
                        break;
                case ECPGd_indicator:
-                       return ("ECPGd_indicator");
+                       return "ECPGd_indicator";
                        break;
                case ECPGd_key_member:
-                       return ("ECPGd_key_member");
+                       return "ECPGd_key_member";
                        break;
                case ECPGd_length:
-                       return ("ECPGd_length");
+                       return "ECPGd_length";
                        break;
                case ECPGd_name:
-                       return ("ECPGd_name");
+                       return "ECPGd_name";
                        break;
                case ECPGd_nullable:
-                       return ("ECPGd_nullable");
+                       return "ECPGd_nullable";
                        break;
                case ECPGd_octet:
-                       return ("ECPGd_octet");
+                       return "ECPGd_octet";
                        break;
                case ECPGd_precision:
-                       return ("ECPGd_precision");
+                       return "ECPGd_precision";
                        break;
                case ECPGd_ret_length:
-                       return ("ECPGd_ret_length");
+                       return "ECPGd_ret_length";
                case ECPGd_ret_octet:
-                       return ("ECPGd_ret_octet");
+                       return "ECPGd_ret_octet";
                        break;
                case ECPGd_scale:
-                       return ("ECPGd_scale");
+                       return "ECPGd_scale";
                        break;
                case ECPGd_type:
-                       return ("ECPGd_type");
+                       return "ECPGd_type";
                        break;
                case ECPGd_cardinality:
-                       return ("ECPGd_cardinality");
+                       return "ECPGd_cardinality";
                default:
                        mmerror(PARSE_ERROR, ET_ERROR, "unrecognized descriptor item code %d", type);
        }
index 31225738e0375f4e3743c8be5b5d7824c45e10a7..39bf3b2474efe1fbae0b98f94282b342ec3e8806 100644 (file)
@@ -18,7 +18,7 @@ new_variable(const char *name, struct ECPGtype *type, int brace_level)
        p->next = allvariables;
        allvariables = p;
 
-       return (p);
+       return p;
 }
 
 static struct variable *
@@ -44,12 +44,12 @@ find_struct_member(char *name, char *str, struct ECPGstruct_member *members, int
                                switch (members->type->type)
                                {
                                        case ECPGt_array:
-                                               return (new_variable(name, ECPGmake_array_type(ECPGmake_simple_type(members->type->u.element->type, members->type->u.element->size, members->type->u.element->counter), members->type->size), brace_level));
+                                               return new_variable(name, ECPGmake_array_type(ECPGmake_simple_type(members->type->u.element->type, members->type->u.element->size, members->type->u.element->counter), members->type->size), brace_level);
                                        case ECPGt_struct:
                                        case ECPGt_union:
-                                               return (new_variable(name, ECPGmake_struct_type(members->type->u.members, members->type->type, members->type->type_name, members->type->struct_sizeof), brace_level));
+                                               return new_variable(name, ECPGmake_struct_type(members->type->u.members, members->type->type, members->type->type_name, members->type->struct_sizeof), brace_level);
                                        default:
-                                               return (new_variable(name, ECPGmake_simple_type(members->type->type, members->type->size, members->type->counter), brace_level));
+                                               return new_variable(name, ECPGmake_simple_type(members->type->type, members->type->size, members->type->counter), brace_level);
                                }
                        }
                        else
@@ -91,26 +91,26 @@ find_struct_member(char *name, char *str, struct ECPGstruct_member *members, int
                                                switch (members->type->u.element->type)
                                                {
                                                        case ECPGt_array:
-                                                               return (new_variable(name, ECPGmake_array_type(ECPGmake_simple_type(members->type->u.element->u.element->type, members->type->u.element->u.element->size, members->type->u.element->u.element->counter), members->type->u.element->size), brace_level));
+                                                               return new_variable(name, ECPGmake_array_type(ECPGmake_simple_type(members->type->u.element->u.element->type, members->type->u.element->u.element->size, members->type->u.element->u.element->counter), members->type->u.element->size), brace_level);
                                                        case ECPGt_struct:
                                                        case ECPGt_union:
-                                                               return (new_variable(name, ECPGmake_struct_type(members->type->u.element->u.members, members->type->u.element->type, members->type->u.element->type_name, members->type->u.element->struct_sizeof), brace_level));
+                                                               return new_variable(name, ECPGmake_struct_type(members->type->u.element->u.members, members->type->u.element->type, members->type->u.element->type_name, members->type->u.element->struct_sizeof), brace_level);
                                                        default:
-                                                               return (new_variable(name, ECPGmake_simple_type(members->type->u.element->type, members->type->u.element->size, members->type->u.element->counter), brace_level));
+                                                               return new_variable(name, ECPGmake_simple_type(members->type->u.element->type, members->type->u.element->size, members->type->u.element->counter), brace_level);
                                                }
                                                break;
                                        case '-':
                                                if (members->type->type == ECPGt_array)
-                                                       return (find_struct_member(name, ++end, members->type->u.element->u.members, brace_level));
+                                                       return find_struct_member(name, ++end, members->type->u.element->u.members, brace_level);
                                                else
-                                                       return (find_struct_member(name, ++end, members->type->u.members, brace_level));
+                                                       return find_struct_member(name, ++end, members->type->u.members, brace_level);
                                                break;
                                                break;
                                        case '.':
                                                if (members->type->type == ECPGt_array)
-                                                       return (find_struct_member(name, end, members->type->u.element->u.members, brace_level));
+                                                       return find_struct_member(name, end, members->type->u.element->u.members, brace_level);
                                                else
-                                                       return (find_struct_member(name, end, members->type->u.members, brace_level));
+                                                       return find_struct_member(name, end, members->type->u.members, brace_level);
                                                break;
                                        default:
                                                mmfatal(PARSE_ERROR, "incorrectly formed variable \"%s\"", name);
@@ -120,7 +120,7 @@ find_struct_member(char *name, char *str, struct ECPGstruct_member *members, int
                }
        }
 
-       return (NULL);
+       return NULL;
 }
 
 static struct variable *
@@ -185,7 +185,7 @@ find_simple(char *name)
                        return p;
        }
 
-       return (NULL);
+       return NULL;
 }
 
 /* Note that this function will end the program in case of an unknown */
@@ -236,12 +236,12 @@ find_variable(char *name)
                                switch (p->type->u.element->type)
                                {
                                        case ECPGt_array:
-                                               return (new_variable(name, ECPGmake_array_type(ECPGmake_simple_type(p->type->u.element->u.element->type, p->type->u.element->u.element->size, p->type->u.element->u.element->counter), p->type->u.element->size), p->brace_level));
+                                               return new_variable(name, ECPGmake_array_type(ECPGmake_simple_type(p->type->u.element->u.element->type, p->type->u.element->u.element->size, p->type->u.element->u.element->counter), p->type->u.element->size), p->brace_level);
                                        case ECPGt_struct:
                                        case ECPGt_union:
-                                               return (new_variable(name, ECPGmake_struct_type(p->type->u.element->u.members, p->type->u.element->type, p->type->u.element->type_name, p->type->u.element->struct_sizeof), p->brace_level));
+                                               return new_variable(name, ECPGmake_struct_type(p->type->u.element->u.members, p->type->u.element->type, p->type->u.element->type_name, p->type->u.element->struct_sizeof), p->brace_level);
                                        default:
-                                               return (new_variable(name, ECPGmake_simple_type(p->type->u.element->type, p->type->u.element->size, p->type->u.element->counter), p->brace_level));
+                                               return new_variable(name, ECPGmake_simple_type(p->type->u.element->type, p->type->u.element->size, p->type->u.element->counter), p->brace_level);
                                }
                        }
                }
@@ -254,7 +254,7 @@ find_variable(char *name)
        if (p == NULL)
                mmfatal(PARSE_ERROR, "variable \"%s\" is not declared", name);
 
-       return (p);
+       return p;
 }
 
 void
@@ -505,7 +505,7 @@ get_typedef(char *name)
        if (!this)
                mmfatal(PARSE_ERROR, "unrecognized data type name \"%s\"", name);
 
-       return (this);
+       return this;
 }
 
 void
index b374bda724f17b682e6719eb0cca83e41ea20de4..c6a4ed85ee706a906a2d9ae2f29a9bf62335fe53 100644 (file)
@@ -206,7 +206,7 @@ main(void)
        }
        free(decarr);
 
-       return (0);
+       return 0;
 }
 
 static void
index 6fcccc6ab4dfbb2ec0229c77e0c42648d8651f2c..4ee7254dff46907f657f37b382bfbc3262c861a8 100644 (file)
@@ -195,5 +195,5 @@ exec sql end declare section;
        strcpy(msg, "disconnect");
        exec sql disconnect;
 
-       return (0);
+       return 0;
 }
index c799de67624fcd15532e272bd36fa9a8eebae229..f1a90488890ec85bcf52fcef9b7ce74aaeef3bee 100644 (file)
@@ -147,7 +147,7 @@ main(void)
        /* ECPG_INFORMIX_BAD_YEAR */
        /* ??? */
 
-       return (0);
+       return 0;
 }
 
 static void
index 162b42505f8c81752a1a9f46610553d16ae212e0..a1070e13311d8ccc3e2781eb62a338725bdfb3df 100644 (file)
@@ -45,7 +45,7 @@ main(void)
        fmtlong(-8494493, "abc: ################+-+");
        fmtlong(-8494493, "+<<<<,<<<,<<<,<<<");
 
-       return (0);
+       return 0;
 }
 
 static void
index e1142d2b2203cd2b8b826d0714d8b55ddf9ec158..423ce41089010c8a356d1f264367c8ace45134b7 100644 (file)
@@ -246,5 +246,5 @@ exec sql end declare section;
        strcpy(msg, "disconnect");
        exec sql disconnect;
 
-       return (0);
+       return 0;
 }
index 4868b3dd81e7ee1ed861612c43c790133a7fb909..86633a7af69f1e16e0b64a283f55a86a110e2af9 100644 (file)
@@ -61,5 +61,5 @@ exec sql end declare section;
        exec sql connect to unix:postgresql://localhost/ecpg2_regression user regress_ecpg_user1 identified by "wrongpw";
        /* no disconnect necessary */
 
-       return (0);
+       return 0;
 }
index 0ced76ec6e5f42f83ce1ae7420a74b85187987d9..f31a7f9bb0748eb8f868fc0d5a4307720cd8b3d9 100644 (file)
@@ -42,5 +42,5 @@ exec sql end declare section;
        /* disconnect from "second" */
        exec sql disconnect;
 
-       return (0);
+       return 0;
 }
index ecf68d42acb82e47fcf12f696ab60645794a71ea..5d075f0e99d860304014ba31a6e0e2496067163a 100644 (file)
@@ -48,5 +48,5 @@ exec sql end declare section;
         *     are used in other tests
         */
 
-       return (0);
+       return 0;
 }
index 185582ca2a5b1110af1c3766771091914b10fab7..b20b17471c6a3122741af636f641f1e8ce57e0c4 100644 (file)
@@ -16,5 +16,5 @@ main(void)
 
        exec sql disconnect DEFAULT;
 
-       return (0);
+       return 0;
 }
index d64ca50c93eb41ef7c2791ee192312c484d010fd..53b86556b15801357e516410a25f510240165d81 100644 (file)
@@ -72,5 +72,5 @@ exec sql end declare section;
        /* not connected */
        exec sql disconnect nonexistant;
 
-       return (0);
+       return 0;
 }
index 3b443e3ffdca1803f8c6a1a34e45a7d022278d07..8951cdb227f1fb8efdd904e5b8d5c5e8522498a5 100644 (file)
@@ -226,7 +226,7 @@ main(void)
        }
        free(decarr);
 
-       return (0);
+       return 0;
 }
 
 static void
index 1b5aae0df7a903faee459d0b0c45bbdda893e459..031a2d776cea27e3d00d183b8589c47343cd3c38 100644 (file)
@@ -463,5 +463,5 @@ if (sqlca.sqlcode < 0) exit (1);}
 #line 196 "describe.pgc"
 
 
-       return (0);
+       return 0;
 }
index ac133c52efd005c3477a299342f4709a05749bc4..87a435e9bd2c25330f805230646ab6e263e350f8 100644 (file)
@@ -158,7 +158,7 @@ main(void)
        /* ECPG_INFORMIX_BAD_YEAR */
        /* ??? */
 
-       return (0);
+       return 0;
 }
 
 static void
index 5f44b35ee710eede6e5d0807226345003bdc2f45..70e015a13013db3a7c9ce1e00ae1067364dbd1bd 100644 (file)
@@ -56,7 +56,7 @@ main(void)
        fmtlong(-8494493, "abc: ################+-+");
        fmtlong(-8494493, "+<<<<,<<<,<<<,<<<");
 
-       return (0);
+       return 0;
 }
 
 static void
index 1df87f83ef065084c01fbf4b4fc9b3f70c4bb59b..fa2e569bbd477344583c72385e8ef457c05f6a00 100644 (file)
@@ -526,5 +526,5 @@ if (sqlca.sqlcode < 0) exit (1);}
 #line 247 "sqlda.pgc"
 
 
-       return (0);
+       return 0;
 }
index 6471abb623ed907ad17175f3c97f50ef1258bda2..18e5968d3ac404fe43445c2c197633afb705c602 100644 (file)
@@ -120,5 +120,5 @@ main(void)
 
        /* no disconnect necessary */
 
-       return (0);
+       return 0;
 }
index cf87c633860012bdd55cd7ed14c8bf3291a66224..deb7f19170850c3408e1785eaf43675719ba5191 100644 (file)
@@ -100,5 +100,5 @@ main(void)
 #line 43 "test2.pgc"
 
 
-       return (0);
+       return 0;
 }
index 5bab6ba8f0c22490d623c2ea706e2b61f09c423a..1a74a069736ee82ac3f13c8e8757d21a6cc629d1 100644 (file)
@@ -102,5 +102,5 @@ main(void)
         *     are used in other tests
         */
 
-       return (0);
+       return 0;
 }
index e1ae3e9a66015fbd2ee030bc429b2a43c6a45b89..ff13e4ec411796d73153213a8bcdf7ce20bca0ca 100644 (file)
@@ -40,5 +40,5 @@ main(void)
 #line 17 "test4.pgc"
 
 
-       return (0);
+       return 0;
 }
index e991ee79b632978c42573352805a964332567134..4b6569e7633406d0ad0016256ff339b30015cd8a 100644 (file)
@@ -158,5 +158,5 @@ main(void)
 #line 73 "test5.pgc"
 
 
-       return (0);
+       return 0;
 }
index 00d43915b2dfee55e9d5bb024ccde7b0cdf8595f..6801669a0e1045150b387515ff6c4b1c50174d44 100644 (file)
@@ -449,5 +449,5 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 366 "dt_test.pgc"
 
 
-       return (0);
+       return 0;
 }
index b6e77562b2434f9226b744c27dbdd646c7d61ecf..4024980f1edc2cb13161084f2dcec95e18e9ab1f 100644 (file)
@@ -182,5 +182,5 @@ main(void)
                PGTYPESinterval_free(i1);
        }
 
-       return (0);
+       return 0;
 }
index ecd234311776ec29c2ddb26a1dc1b1767b5e906a..c83128405914dd59befd5bb08f7d0be772203786 100644 (file)
@@ -269,5 +269,5 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 91 "nan_test.pgc"
 
 
-       return (0);
+       return 0;
 }
index 8019a8f63e78cf128d12bd7136a5df997a5eb968..47c320291f233af7bd8965bc5bafae15f666e416 100644 (file)
@@ -157,5 +157,5 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 94 "num_test.pgc"
 
 
-       return (0);
+       return 0;
 }
index 83636ad880016b8c3768d39a0b77aaeef4dd08ad..d31834e2c039d0640decc400a5d6e2b729172bf5 100644 (file)
@@ -228,7 +228,7 @@ main(void)
        }
        free(numarr);
 
-       return (0);
+       return 0;
 }
 
 static void
index c4ae862b499e752383d9db250f4af43f44d6ff1c..1cf371092fe100bf711e8b98bf6b1026152d7d40 100644 (file)
@@ -284,5 +284,5 @@ if (sqlca.sqlcode < 0) sqlprint();}
 #line 92 "array_of_struct.pgc"
 
 
-    return( 0 );
+    return 0;
 }
index f7da753a3dfdae114a77968ca366a9b88663ce2a..482290174210a2fa923e1c418890cc6a84576045 100644 (file)
@@ -830,5 +830,5 @@ if (sqlca.sqlcode < 0) exit (1);}
 #line 253 "cursor.pgc"
 
 
-       return (0);
+       return 0;
 }
index c8ae6f98dc2abb31c275d6f28759ae28d290f68b..bde15b74a0e7c38897577f96d7e5ad1825dc95db 100644 (file)
@@ -164,5 +164,5 @@ if (sqlca.sqlcode < 0) sqlprint();}
 #line 59 "define.pgc"
 
 
-       return (0);
+       return 0;
 }
index 1a9dd85438eb2371ad7d98416c1d7b655250a10e..143e9662618b373cbaf6a7ecf55fb2d37ae0a56d 100644 (file)
@@ -477,5 +477,5 @@ if (sqlca.sqlcode < 0) exit (1);}
 #line 144 "describe.pgc"
 
 
-       return (0);
+       return 0;
 }
index b3deb221d74969aedee369bfdba4d3d95c2ec83f..f4676a083a18336e4f2a7095e44b26f8fc4b9ff2 100644 (file)
@@ -374,5 +374,5 @@ if (sqlca.sqlcode < 0) exit (1);}
 #line 124 "outofscope.pgc"
 
 
-       return (0);
+       return 0;
 }
index 5a0f9caee361bab3fe15c7e08dec385d882615f1..7b1f58e835ff4f9b10859fcda50c4a650913c1e5 100644 (file)
@@ -289,5 +289,5 @@ if (sqlca.sqlcode < 0) sqlprint();}
 
 
        /* All the memory will anyway be freed at the end */
-    return( 0 );
+    return 0;
 }
index 89d17e96c929dbe2c9b24791404393f6ca5b2137..2053443e81817c9472b783533bf3c7fa9d5780b1 100644 (file)
@@ -66,5 +66,5 @@ int main(void)
   { ECPGdisconnect(__LINE__, "CURRENT");}
 #line 25 "strings.pgc"
 
-  return (0);
+  return 0;
 }
index 7fd03ba7d3992687cf565dca1a7aed937598fe4b..08e2355d169201c2562439164693af7cdf3fe1a7 100644 (file)
@@ -272,5 +272,5 @@ if (sqlca.sqlcode < 0) exit (1);}
 #line 98 "variable.pgc"
 
 
-       return (0);
+       return 0;
 }
index 781c4267718e05fcb5c18e17c2da68a58585637e..f5eb73d185283cd622db1295782e322f35c7e595 100644 (file)
@@ -351,5 +351,5 @@ if (sqlca.sqlcode < 0) sqlprint();}
 
        free(t);
 
-       return (0);
+       return 0;
 }
index 155e206f29d75f7fbc6ab341a7038a37b5bc01a2..b79a6f4016ae7aa7eba51d4bff3b5d19648cb426 100644 (file)
@@ -461,5 +461,5 @@ if (sqlca.sqlcode < 0) exit (1);}
 #line 196 "describe.pgc"
 
 
-       return (0);
+       return 0;
 }
index aee3c1bcb75094c5f3fece8bb0c6b0dfe30781e9..cac91dc5999da0f1c370f03f79319a145d369091 100644 (file)
@@ -327,5 +327,5 @@ if (sqlca.sqlcode < 0) sqlprint();}
 #line 110 "execute.pgc"
 
 
-       return (0);
+       return 0;
 }
index 5b74dda9b583d0f6aa47d683c76fd329354529aa..d6a661e3fb50512927dae94d5cd469b1cd8f0d32 100644 (file)
@@ -247,5 +247,5 @@ if (sqlca.sqlcode < 0) sqlprint();}
 #line 87 "oldexec.pgc"
 
 
-       return (0);
+       return 0;
 }
index 15c81c6b126a686dafc8e727fdc64ac33ee294b4..ffaf52ca5c639d87d89f7dab87c85c33ad60a9b1 100644 (file)
@@ -527,5 +527,5 @@ if (sqlca.sqlcode < 0) exit (1);}
 #line 247 "sqlda.pgc"
 
 
-       return (0);
+       return 0;
 }
index cf491fc078c65c2b5936d150ff22c38552c6ff72..20b54d35e56a49ce1269fa47002f91d6cf8f5b0f 100644 (file)
@@ -110,5 +110,5 @@ if (sqlca.sqlcode < 0) sqlprint();}
 #line 41 "twophase.pgc"
 
 
-       return (0);
+       return 0;
 }
index 6e809d60fbc2cc2f728a22443086406033417893..420bbf194a82704af0d2b8eca756a09a39315478 100644 (file)
@@ -91,7 +91,7 @@ int main()
   if( threads == NULL )
     {
       fprintf(stderr, "Cannot alloc memory\n");
-      return( 1 );
+      return 1;
     }
   for( n = 0; n < nthreads; n++ )
     {
@@ -133,7 +133,7 @@ int main()
   else
     printf("ERROR: Failure - expecting %d rows, got %d.\n", nthreads * iterations, l_rows);
 
-  return( 0 );
+  return 0;
 }
 
 void *test_thread(void *arg)
@@ -177,7 +177,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
   if( sqlca.sqlcode != 0 )
     {
       printf("%s: ERROR: cannot connect to database!\n", l_connection);
-      return( NULL );
+      return NULL;
     }
   { ECPGtrans(__LINE__, l_connection, "begin");
 #line 126 "thread.pgc"
@@ -216,6 +216,6 @@ if (sqlca.sqlcode < 0) sqlprint();}
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 138 "thread.pgc"
 
-  return( NULL );
+  return NULL;
 }
 #endif /* ENABLE_THREAD_SAFETY */
index b42c5566338419624bf5dcb55de234ca8527f210..4bddca9fb9853e9b5134d3a45bb0ef6ec390df86 100644 (file)
@@ -92,7 +92,7 @@ int main()
   if( threads == NULL )
     {
       fprintf(stderr, "Cannot alloc memory\n");
-      return( 1 );
+      return 1;
     }
   for( n = 0; n < nthreads; n++ )
     {
@@ -134,7 +134,7 @@ int main()
   else
     printf("ERROR: Failure - expecting %d rows, got %d.\n", nthreads * iterations, l_rows);
 
-  return( 0 );
+  return 0;
 }
 
 void *test_thread(void *arg)
@@ -178,7 +178,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
   if( sqlca.sqlcode != 0 )
     {
       printf("%s: ERROR: cannot connect to database!\n", l_connection);
-      return( NULL );
+      return NULL;
     }
   { ECPGtrans(__LINE__, NULL, "begin");
 #line 127 "thread_implicit.pgc"
@@ -217,6 +217,6 @@ if (sqlca.sqlcode < 0) sqlprint();}
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 139 "thread_implicit.pgc"
 
-  return( NULL );
+  return NULL;
 }
 #endif /* ENABLE_THREAD_SAFETY */
index 3ed2ba0f5edc76bbb241a9d4eac924b419da4d32..c8a9934986603267bfc00eb16529a9c48564e251 100644 (file)
@@ -140,5 +140,5 @@ exec sql end declare section;
 
        exec sql disconnect;
 
-       return (0);
+       return 0;
 }
index 768cbd5e6f1f3b021c13b6a9c8aa93ca4c7519b7..5e0d86847dd00e73566160a0df9f8ef3ef459239 100644 (file)
@@ -365,5 +365,5 @@ main(void)
        exec sql rollback;
         exec sql disconnect;
 
-       return (0);
+       return 0;
 }
index d519305e1881224db039dc0c6e4098bdc6dd82ce..9e1f432823fb659ed9a849e61d2de9b37d81ee43 100644 (file)
@@ -147,5 +147,5 @@ main(void)
                PGTYPESinterval_free(i1);
        }
 
-       return (0);
+       return 0;
 }
index 3b5781632e87c6195c5f3aad3870b5f7bf15d2db..bc682b93d560b99a426899479d112bd699025802 100644 (file)
@@ -90,5 +90,5 @@ main(void)
        exec sql rollback;
        exec sql disconnect;
 
-       return (0);
+       return 0;
 }
index a024c8702fb7ec3ffaad77210135b6eccb42e4a5..d276f70772bf78c239ae80a525a767191d563d63 100644 (file)
@@ -93,5 +93,5 @@ main(void)
        exec sql rollback;
        exec sql disconnect;
 
-       return (0);
+       return 0;
 }
index 2ac666f7c02153c921d7b3c8a893a0a755531b52..16ca6a44a5e5f569e678c1ec14a8b5b0ead1c710 100644 (file)
@@ -210,7 +210,7 @@ main(void)
        }
        free(numarr);
 
-       return (0);
+       return 0;
 }
 
 static void
index f9e1946b3f1b2468510e12e9cc1ff7e2ad30ff0d..69f575847428e58b47543368ee0e5bef41bd42e8 100644 (file)
@@ -91,5 +91,5 @@ int main()
 
     EXEC SQL disconnect all;
 
-    return( 0 );
+    return 0;
 }
index 424791298978fffe3e202fe53831e799aa978fd4..8a286ad523aefad35667b1e0ca598d17499fad2e 100644 (file)
@@ -252,5 +252,5 @@ exec sql end declare section;
        strcpy(msg, "disconnect");
        exec sql disconnect all;
 
-       return (0);
+       return 0;
 }
index 2161733f497c40a3ae94766816ef1d239fec0629..0d07ebfe6363c3d0dbbaf90f84ff78276d9711f1 100644 (file)
@@ -58,5 +58,5 @@ exec sql end declare section;
        exec sql commit;
        exec sql disconnect;
 
-       return (0);
+       return 0;
 }
index 6b5d2707cef651bf9f7ea36a8dc2e35c59516adf..aae53250a54409256732d33a09fa5e9e16ba33e2 100644 (file)
@@ -123,5 +123,5 @@ main (void)
        strcpy(msg, "disconnect");
        exec sql disconnect;
 
-       return (0);
+       return 0;
 }
index ec94273408b507100c2bf67be317f3455ddab5f2..1ec651e3fc31a14c9d49288b0857ef671766f83d 100644 (file)
@@ -96,5 +96,5 @@ int main()
     EXEC SQL disconnect all;
 
        /* All the memory will anyway be freed at the end */
-    return( 0 );
+    return 0;
 }
index d6ec9a4cb813064ada9cbd170eab728e18480eb9..f004ddf6dc1e1c28183c73dbd67ffa808948f6a5 100644 (file)
@@ -23,5 +23,5 @@ int main(void)
   printf("%s %s %s %s %s %s\n", s1, s2, s3, s4, s5, s6);
 
   exec sql disconnect;
-  return (0);
+  return 0;
 }
index 05420afdb2c489296b6c589d65245d18197105cc..697a7dc81432e474850ae009f0875912bfde7bd1 100644 (file)
@@ -97,5 +97,5 @@ exec sql end declare section;
        strcpy(msg, "disconnect");
        exec sql disconnect;
 
-       return (0);
+       return 0;
 }
index 5f12c472c965b47b012ecc5915e8296ede9a0509..15c9cfa5f72f7ae5bbc3699d520d833748043a95 100644 (file)
@@ -107,5 +107,5 @@ EXEC SQL END DECLARE SECTION;
 
        free(t);
 
-       return (0);
+       return 0;
 }
index b95ab351bd06967f60e9f010b46ffd822495fc88..87d6bd9a29c50f6d21d57ec7f54f65d3fd457efd 100644 (file)
@@ -195,5 +195,5 @@ exec sql end declare section;
        strcpy(msg, "disconnect");
        exec sql disconnect;
 
-       return (0);
+       return 0;
 }
index b8364c78bba2344a975358dd13f5cadc3093723b..cc9814e9bea711f78a2d185968e5327346b77c8f 100644 (file)
@@ -109,5 +109,5 @@ exec sql end declare section;
        exec sql commit;
        exec sql disconnect;
 
-       return (0);
+       return 0;
 }
index 2988f2ab8a4a94f515e63d1b6e4b5cc6f71bf135..4f94a18aa1b0878ed8e5e1c10b9788819e0e64c1 100644 (file)
@@ -86,5 +86,5 @@ exec sql end declare section;
        exec sql commit;
        exec sql disconnect;
 
-       return (0);
+       return 0;
 }
index 29774b590908c10aae1b32aa12211a50583d3800..eaf5c6f7e1c6b09b0455397bbc8940ec19a45912 100644 (file)
@@ -246,5 +246,5 @@ exec sql end declare section;
        strcpy(msg, "disconnect");
        exec sql disconnect;
 
-       return (0);
+       return 0;
 }
index 867a28e4c46f05dbff69d309b2f348c9815a2ecb..38913d7af2d7c78a9229e50dca877240cb9c79c1 100644 (file)
@@ -40,5 +40,5 @@ int main(void)
        strcpy(msg, "disconnect");
        exec sql disconnect current;
 
-       return (0);
+       return 0;
 }
index c5fbe928d9fbf8bd33d97ac9e743ce158d3b6f7a..ae6b229962b400a8e3e277f799782cf436679771 100644 (file)
@@ -60,7 +60,7 @@ int main()
   if( threads == NULL )
     {
       fprintf(stderr, "Cannot alloc memory\n");
-      return( 1 );
+      return 1;
     }
   for( n = 0; n < nthreads; n++ )
     {
@@ -92,7 +92,7 @@ int main()
   else
     printf("ERROR: Failure - expecting %d rows, got %d.\n", nthreads * iterations, l_rows);
 
-  return( 0 );
+  return 0;
 }
 
 void *test_thread(void *arg)
@@ -121,7 +121,7 @@ void *test_thread(void *arg)
   if( sqlca.sqlcode != 0 )
     {
       printf("%s: ERROR: cannot connect to database!\n", l_connection);
-      return( NULL );
+      return NULL;
     }
   EXEC SQL AT :l_connection BEGIN;
 
@@ -136,6 +136,6 @@ void *test_thread(void *arg)
   /* all done */
   EXEC SQL AT :l_connection COMMIT;
   EXEC SQL DISCONNECT :l_connection;
-  return( NULL );
+  return NULL;
 }
 #endif /* ENABLE_THREAD_SAFETY */
index d65f17c07367c9216906b13eb47582318fcb16ec..0dfcb7172bc0bd5cac1d4f03127d3b2ca58b0c66 100644 (file)
@@ -61,7 +61,7 @@ int main()
   if( threads == NULL )
     {
       fprintf(stderr, "Cannot alloc memory\n");
-      return( 1 );
+      return 1;
     }
   for( n = 0; n < nthreads; n++ )
     {
@@ -93,7 +93,7 @@ int main()
   else
     printf("ERROR: Failure - expecting %d rows, got %d.\n", nthreads * iterations, l_rows);
 
-  return( 0 );
+  return 0;
 }
 
 void *test_thread(void *arg)
@@ -122,7 +122,7 @@ void *test_thread(void *arg)
   if( sqlca.sqlcode != 0 )
     {
       printf("%s: ERROR: cannot connect to database!\n", l_connection);
-      return( NULL );
+      return NULL;
     }
   EXEC SQL BEGIN;
 
@@ -137,6 +137,6 @@ void *test_thread(void *arg)
   /* all done */
   EXEC SQL COMMIT;
   EXEC SQL DISCONNECT :l_connection;
-  return( NULL );
+  return NULL;
 }
 #endif /* ENABLE_THREAD_SAFETY */
index aed9269c63b5eec8c7498f415c0e63935cb6ed81..a9528bda6bbd070e4203eafebeab5841d5819341 100644 (file)
@@ -39,11 +39,11 @@ comment                     ("#"{non_newline}*)
 
 %%
 
-permutation            { return(PERMUTATION); }
-session                        { return(SESSION); }
-setup                  { return(SETUP); }
-step                   { return(STEP); }
-teardown               { return(TEARDOWN); }
+permutation            { return PERMUTATION; }
+session                        { return SESSION; }
+setup                  { return SETUP; }
+step                   { return STEP; }
+teardown               { return TEARDOWN; }
 
 [\n]                   { yyline++; }
 {comment}              { /* ignore */ }