aboutsummaryrefslogtreecommitdiff
path: root/src/interfaces/ecpg
diff options
context:
space:
mode:
Diffstat (limited to 'src/interfaces/ecpg')
-rw-r--r--src/interfaces/ecpg/lib/ecpglib.c4
-rw-r--r--src/interfaces/ecpg/preproc/c_keywords.c4
-rw-r--r--src/interfaces/ecpg/preproc/ecpg.c6
-rw-r--r--src/interfaces/ecpg/preproc/ecpg_keywords.c4
-rw-r--r--src/interfaces/ecpg/preproc/keywords.c6
-rw-r--r--src/interfaces/ecpg/preproc/pgc.l62
-rw-r--r--src/interfaces/ecpg/preproc/preproc.y6
-rw-r--r--src/interfaces/ecpg/preproc/type.c2
8 files changed, 47 insertions, 47 deletions
diff --git a/src/interfaces/ecpg/lib/ecpglib.c b/src/interfaces/ecpg/lib/ecpglib.c
index 23abd32a73d..b2bb9f1415d 100644
--- a/src/interfaces/ecpg/lib/ecpglib.c
+++ b/src/interfaces/ecpg/lib/ecpglib.c
@@ -863,12 +863,12 @@ ECPGtrans(int lineno, const char * transaction)
if ((res = PQexec(actual_connection->connection, transaction)) == NULL)
{
register_error(ECPG_TRANS, "Error in transaction processing line %d.", lineno);
- return (FALSE);
+ return FALSE;
}
PQclear(res);
if (strcmp(transaction, "commit") == 0 || strcmp(transaction, "rollback") == 0)
committed = 1;
- return (TRUE);
+ return TRUE;
}
bool
diff --git a/src/interfaces/ecpg/preproc/c_keywords.c b/src/interfaces/ecpg/preproc/c_keywords.c
index ed5501b6113..d208a406e37 100644
--- a/src/interfaces/ecpg/preproc/c_keywords.c
+++ b/src/interfaces/ecpg/preproc/c_keywords.c
@@ -54,12 +54,12 @@ ScanCKeywordLookup(char *text)
middle = low + (high - low) / 2;
difference = strcmp(middle->name, text);
if (difference == 0)
- return (middle);
+ return middle;
else if (difference < 0)
low = middle + 1;
else
high = middle - 1;
}
- return (NULL);
+ return NULL;
}
diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c
index 3d8624b334a..69b1e650a22 100644
--- a/src/interfaces/ecpg/preproc/ecpg.c
+++ b/src/interfaces/ecpg/preproc/ecpg.c
@@ -76,10 +76,10 @@ main(int argc, char *const argv[])
for (ip = include_paths; ip != NULL; ip = ip->next)
fprintf(stderr, " %s\n", ip->path);
fprintf(stderr, "End of search list.\n");
- return (OK);
+ return OK;
default:
usage(argv[0]);
- return (ILLEGAL_OPTION);
+ return ILLEGAL_OPTION;
}
}
@@ -193,5 +193,5 @@ main(int argc, char *const argv[])
free(input_filename);
}
}
- return (OK);
+ return OK;
}
diff --git a/src/interfaces/ecpg/preproc/ecpg_keywords.c b/src/interfaces/ecpg/preproc/ecpg_keywords.c
index f7aac477d5f..f8faba26709 100644
--- a/src/interfaces/ecpg/preproc/ecpg_keywords.c
+++ b/src/interfaces/ecpg/preproc/ecpg_keywords.c
@@ -55,12 +55,12 @@ ScanECPGKeywordLookup(char *text)
middle = low + (high - low) / 2;
difference = strcmp(middle->name, text);
if (difference == 0)
- return (middle);
+ return middle;
else if (difference < 0)
low = middle + 1;
else
high = middle - 1;
}
- return (NULL);
+ return NULL;
}
diff --git a/src/interfaces/ecpg/preproc/keywords.c b/src/interfaces/ecpg/preproc/keywords.c
index a17455de3fe..79ba20f628e 100644
--- a/src/interfaces/ecpg/preproc/keywords.c
+++ b/src/interfaces/ecpg/preproc/keywords.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.3 1998/08/25 21:37:06 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.4 1998/09/01 03:28:41 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -234,12 +234,12 @@ ScanKeywordLookup(char *text)
middle = low + (high - low) / 2;
difference = strcmp(middle->name, text);
if (difference == 0)
- return (middle);
+ return middle;
else if (difference < 0)
low = middle + 1;
else
high = middle - 1;
}
- return (NULL);
+ return NULL;
}
diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l
index 5336d132bf9..57712699c8a 100644
--- a/src/interfaces/ecpg/preproc/pgc.l
+++ b/src/interfaces/ecpg/preproc/pgc.l
@@ -206,7 +206,7 @@ cppline {space}*#.*(\\{space}*\n)*\n*
yylval.ival = strtol((char *)literal,&endptr,2);
if (*endptr != '\0' || errno == ERANGE)
yyerror("ERROR: Bad binary integer input!");
- return (ICONST);
+ return ICONST;
}
<xh>{xhinside} |
<xb>{xbinside} {
@@ -232,7 +232,7 @@ cppline {space}*#.*(\\{space}*\n)*\n*
yylval.ival = strtol((char *)literal,&endptr,16);
if (*endptr != '\0' || errno == ERANGE)
yyerror("ERROR: Bad hexadecimal integer input");
- return (ICONST);
+ return ICONST;
}
<SQL>{xqstart} {
@@ -243,7 +243,7 @@ cppline {space}*#.*(\\{space}*\n)*\n*
<xq>{xqstop} {
BEGIN(SQL);
yylval.str = strdup(scanstr(literal));
- return (SCONST);
+ return SCONST;
}
<xq>{xqdouble} |
<xq>{xqinside} {
@@ -278,7 +278,7 @@ cppline {space}*#.*(\\{space}*\n)*\n*
<xd>{xdstop} {
BEGIN(SQL);
yylval.str = strdup(literal);
- return (CSTRING);
+ return CSTRING;
}
<xd>{xdinside} {
if ((llen+yyleng) > (MAX_PARSE_BUFFER - 1))
@@ -294,7 +294,7 @@ cppline {space}*#.*(\\{space}*\n)*\n*
<xdc>{xdstop} {
BEGIN(C);
yylval.str = strdup(literal);
- return (CSTRING);
+ return CSTRING;
}
<xdc>{xdinside} {
if ((llen+yyleng) > (MAX_PARSE_BUFFER - 1))
@@ -306,30 +306,30 @@ cppline {space}*#.*(\\{space}*\n)*\n*
<xm>{space}* { /* ignore */ }
<xm>{xmstop} {
BEGIN(SQL);
- return (yytext[0]);
+ return yytext[0];
}
<SQL>{typecast} { return TYPECAST; }
<SQL>{self}/{space}*-[\.0-9] {
BEGIN(xm);
- return (yytext[0]);
+ return yytext[0];
}
-<SQL>{self} { return (yytext[0]); }
+<SQL>{self} { return yytext[0]; }
<SQL>{operator}/-[\.0-9] {
yylval.str = strdup((char*)yytext);
- return (Op);
+ return Op;
}
<SQL>{operator} {
if (strcmp((char*)yytext,"!=") == 0)
yylval.str = strdup("<>"); /* compatability */
else
yylval.str = strdup((char*)yytext);
- return (Op);
+ return Op;
}
<SQL>{param} {
yylval.ival = atoi((char*)&yytext[1]);
- return (PARAM);
+ return PARAM;
}
<SQL>{identifier}/{space}*-{number} {
int i;
@@ -342,13 +342,13 @@ cppline {space}*#.*(\\{space}*\n)*\n*
keyword = ScanKeywordLookup((char*)yytext);
if (keyword != NULL) {
- return (keyword->value);
+ return keyword->value;
}
else
{
keyword = ScanECPGKeywordLookup((char*)yytext);
if (keyword != NULL) {
- return (keyword->value);
+ return keyword->value;
}
else
{
@@ -376,7 +376,7 @@ cppline {space}*#.*(\\{space}*\n)*\n*
if (ptr == NULL)
{
yylval.str = strdup((char*)yytext);
- return (IDENT);
+ return IDENT;
}
}
}
@@ -394,9 +394,9 @@ cppline {space}*#.*(\\{space}*\n)*\n*
if (*endptr != '\0' || errno == ERANGE)
yyerror("ERROR: Bad integer input");
yyerror("WARNING: Integer input is out of range; promoted to float");
- return (FCONST);
+ return FCONST;
}
- return (ICONST);
+ return ICONST;
}
<SQL>{real}/{space}*-{number} {
char* endptr;
@@ -406,7 +406,7 @@ cppline {space}*#.*(\\{space}*\n)*\n*
yylval.dval = strtod(((char *)yytext),&endptr);
if (*endptr != '\0' || errno == ERANGE)
yyerror("ERROR: Bad float8 input");
- return (FCONST);
+ return FCONST;
}
<SQL>{integer} {
char* endptr;
@@ -420,9 +420,9 @@ cppline {space}*#.*(\\{space}*\n)*\n*
if (*endptr != '\0' || errno == ERANGE)
yyerror("ERROR: Bad integer input");
yyerror("WARNING: Integer input is out of range; promoted to float");
- return (FCONST);
+ return FCONST;
}
- return (ICONST);
+ return ICONST;
}
<SQL>{real} {
char* endptr;
@@ -431,7 +431,7 @@ cppline {space}*#.*(\\{space}*\n)*\n*
yylval.dval = strtod((char *)yytext,&endptr);
if (*endptr != '\0' || errno == ERANGE)
yyerror("ERROR: Bad float input");
- return (FCONST);
+ return FCONST;
}
<C>{integer}/{space}*-{number} {
char* endptr;
@@ -446,9 +446,9 @@ cppline {space}*#.*(\\{space}*\n)*\n*
if (*endptr != '\0' || errno == ERANGE)
yyerror("ERROR: Bad integer input");
yyerror("WARNING: Integer input is out of range; promoted to float");
- return (FCONST);
+ return FCONST;
}
- return (ICONST);
+ return ICONST;
}
<C>{integer} {
char* endptr;
@@ -462,9 +462,9 @@ cppline {space}*#.*(\\{space}*\n)*\n*
if (*endptr != '\0' || errno == ERANGE)
yyerror("ERROR: Bad integer input");
yyerror("WARNING: Integer input is out of range; promoted to float");
- return (FCONST);
+ return FCONST;
}
- return (ICONST);
+ return ICONST;
}
<SQL>:{identifier}(("->"|\.){identifier})* {
yylval.str = strdup((char*)yytext+1);
@@ -480,13 +480,13 @@ cppline {space}*#.*(\\{space}*\n)*\n*
keyword = ScanKeywordLookup((char*)yytext);
if (keyword != NULL) {
- return (keyword->value);
+ return keyword->value;
}
else
{
keyword = ScanECPGKeywordLookup((char*)yytext);
if (keyword != NULL) {
- return (keyword->value);
+ return keyword->value;
}
else
{
@@ -514,14 +514,14 @@ cppline {space}*#.*(\\{space}*\n)*\n*
if (ptr == NULL)
{
yylval.str = strdup((char*)yytext);
- return (IDENT);
+ return IDENT;
}
}
}
}
<SQL>{space} { /* ignore */ }
<SQL>";" { BEGIN C; return SQL_SEMI; }
-<SQL>{other} { return (yytext[0]); }
+<SQL>{other} { return yytext[0]; }
<C>{exec}{space}{sql} { BEGIN SQL; return SQL_START; }
<C>{ccomment} { /* ignore */ }
<C>{cppline} {
@@ -533,7 +533,7 @@ cppline {space}*#.*(\\{space}*\n)*\n*
keyword = ScanCKeywordLookup((char*)yytext);
if (keyword != NULL) {
- return (keyword->value);
+ return keyword->value;
}
else
{
@@ -561,7 +561,7 @@ cppline {space}*#.*(\\{space}*\n)*\n*
if (ptr == NULL)
{
yylval.str = strdup((char*)yytext);
- return (IDENT);
+ return IDENT;
}
}
}
@@ -574,7 +574,7 @@ cppline {space}*#.*(\\{space}*\n)*\n*
<C>\[ { return('['); }
<C>\] { return(']'); }
<C>\= { return('='); }
-<C>{other} { return (S_ANYTHING); }
+<C>{other} { return S_ANYTHING; }
<C>{exec}{space}{sql}{space}{define} {BEGIN(def_ident);}
<def_ident>{space} {}
<def_ident>{identifier} {
diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
index 929ab01ed21..63389405c2d 100644
--- a/src/interfaces/ecpg/preproc/preproc.y
+++ b/src/interfaces/ecpg/preproc/preproc.y
@@ -171,9 +171,9 @@ find_struct(char * name, char *next)
if (c == '-')
{
next++;
- return (find_struct_member(name, next, p->type->u.element->u.members));
+ return find_struct_member(name, next, p->type->u.element->u.members);
}
- else return (find_struct_member(name, next, p->type->u.members));
+ else return find_struct_member(name, next, p->type->u.members);
}
static struct variable *
@@ -333,7 +333,7 @@ make1_str(const char *str)
char * res_str = (char *)mm_alloc(strlen(str) + 1);
strcpy(res_str, str);
- return (res_str);
+ return res_str;
}
static char *
diff --git a/src/interfaces/ecpg/preproc/type.c b/src/interfaces/ecpg/preproc/type.c
index dd395c80eb9..cf115ea02d5 100644
--- a/src/interfaces/ecpg/preproc/type.c
+++ b/src/interfaces/ecpg/preproc/type.c
@@ -17,7 +17,7 @@ mm_alloc(size_t size)
exit(OUT_OF_MEMORY);
}
- return (ptr);
+ return ptr;
}
/* duplicate memberlist */
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-04 14:26:09 +0000