Commit a1635450 authored by Bruce Momjian's avatar Bruce Momjian

Cleanups needed for indent. Remove };

parent fe97d580
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.23 1997/09/04 13:17:59 vadim Exp $ * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.24 1997/09/05 18:13:45 momjian Exp $
* *
* INTERFACE ROUTINES * INTERFACE ROUTINES
* heap_creatr() - Create an uncataloged heap relation * heap_creatr() - Create an uncataloged heap relation
...@@ -262,7 +262,7 @@ heap_creatr(char *name, ...@@ -262,7 +262,7 @@ heap_creatr(char *name,
sprintf(tempname, "temp_%d", relid); sprintf(tempname, "temp_%d", relid);
relname = tempname; relname = tempname;
isTemp = 1; isTemp = 1;
}; }
} }
/* ---------------- /* ----------------
...@@ -1403,7 +1403,7 @@ InitTempRelList(void) ...@@ -1403,7 +1403,7 @@ InitTempRelList(void)
if (tempRels) { if (tempRels) {
free(tempRels->rels); free(tempRels->rels);
free(tempRels); free(tempRels);
}; }
tempRels = (TempRelList*)malloc(sizeof(TempRelList)); tempRels = (TempRelList*)malloc(sizeof(TempRelList));
tempRels->size = TEMP_REL_LIST_SIZE; tempRels->size = TEMP_REL_LIST_SIZE;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.2 1996/10/31 10:59:15 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.3 1997/09/05 18:10:32 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -384,7 +384,6 @@ pg_checkretval(Oid rettype, QueryTreeList *queryTreeList) ...@@ -384,7 +384,6 @@ pg_checkretval(Oid rettype, QueryTreeList *queryTreeList)
tletype = (Oid) ((Param*)thenode)->paramtype; tletype = (Oid) ((Param*)thenode)->paramtype;
else if (IsA(thenode,Expr)) { else if (IsA(thenode,Expr)) {
tletype = Expr tletype = Expr
}
} else if (IsA(thenode,LispList)) { } else if (IsA(thenode,LispList)) {
thenode = lfirst(thenode); thenode = lfirst(thenode);
if (IsA(thenode,Oper)) if (IsA(thenode,Oper))
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.2 1997/03/18 18:40:40 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.3 1997/09/05 18:10:36 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -218,7 +218,7 @@ create_seqscan_path(Rel *rel) ...@@ -218,7 +218,7 @@ create_seqscan_path(Rel *rel)
#if 0 #if 0
if (XfuncMode != XFUNC_OFF) { if (XfuncMode != XFUNC_OFF) {
pathnode->path_cost += pathnode->path_cost +=
xfunc_get_path_cost(pathnode)); xfunc_get_path_cost(pathnode);
} }
#endif #endif
return (pathnode); return (pathnode);
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.36 1997/09/01 05:56:34 thomas Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.37 1997/09/05 18:10:42 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -1353,7 +1353,7 @@ make_targetlist_expr(ParseState *pstate, ...@@ -1353,7 +1353,7 @@ make_targetlist_expr(ParseState *pstate,
} else } else
if (attrtype != type_id) { if (attrtype != type_id) {
if ((attrtype == INT2OID) && (type_id == INT4OID)) if ((attrtype == INT2OID) && (type_id == INT4OID))
lfirst(expr) = lispInteger (INT2OID); do CASHOID too lfirst(expr) = lispInteger (INT2OID); /* handle CASHOID too*/
else if ((attrtype == FLOAT4OID) && (type_id == FLOAT8OID)) else if ((attrtype == FLOAT4OID) && (type_id == FLOAT8OID))
lfirst(expr) = lispInteger (FLOAT4OID); lfirst(expr) = lispInteger (FLOAT4OID);
else else
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/s_lock.c,v 1.20 1997/08/24 23:07:28 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/s_lock.c,v 1.21 1997/09/05 18:10:54 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -481,19 +481,19 @@ S_INIT_LOCK(slock_t *lock) ...@@ -481,19 +481,19 @@ S_INIT_LOCK(slock_t *lock)
static int tas_dummy() static int tas_dummy()
{ {
__asm__(" __asm__(" \n\
tas: /* r3 points to the location of p */ tas: \n\
lwarx 5,0,3 /* r5 = *p */ lwarx 5,0,3 \n\
cmpwi 5,0 /* r5 == 0 ? */ cmpwi 5,0 \n\
bne fail /* if not 0, jump to fail */ bne fail \n\
addi 5,5,1 /* set 1 to r5 */ addi 5,5,1 \n\
stwcx. 5,0,3 /* try update p atomically */ stwcx. 5,0,3 \n\
beq success /* jump if scceed */ beq success \n\
fail: li 3,1 /* set 1 to r3 */ fail: li 3,1 \n\
blr blr \n\
success: success: \n\
li 3,0 /* set 0 to r3 */ li 3,0 \n\
blr blr \n\
"); ");
} }
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.13 1997/08/19 21:34:30 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.14 1997/09/05 18:11:05 momjian Exp $
* *
* NOTES * NOTES
* This code is actually (almost) unused. * This code is actually (almost) unused.
...@@ -144,7 +144,7 @@ printf( "reltimein- %d fields are type %d (DTK_DATE=%d)\n", nf, dtype, DTK_DATE) ...@@ -144,7 +144,7 @@ printf( "reltimein- %d fields are type %d (DTK_DATE=%d)\n", nf, dtype, DTK_DATE)
default: default:
return(INVALID_RELTIME); return(INVALID_RELTIME);
}; }
elog(WARN,"Bad reltime (internal coding error) '%s'",str); elog(WARN,"Bad reltime (internal coding error) '%s'",str);
return(INVALID_RELTIME); return(INVALID_RELTIME);
...@@ -166,7 +166,7 @@ char *reltimeout(int32 time) ...@@ -166,7 +166,7 @@ char *reltimeout(int32 time)
} else { } else {
reltime2tm(time, tm); reltime2tm(time, tm);
EncodeTimeSpan( tm, 0, DateStyle, buf); EncodeTimeSpan( tm, 0, DateStyle, buf);
}; }
result = PALLOC(strlen(buf)+1); result = PALLOC(strlen(buf)+1);
strcpy( result, buf); strcpy( result, buf);
...@@ -305,7 +305,7 @@ timespan_reltime(TimeSpan *timespan) ...@@ -305,7 +305,7 @@ timespan_reltime(TimeSpan *timespan)
} else { } else {
year = 0; year = 0;
month = timespan->month; month = timespan->month;
}; }
span = (((((double) 365*year)+((double) 30*month))*86400) + timespan->time); span = (((((double) 365*year)+((double) 30*month))*86400) + timespan->time);
...@@ -315,7 +315,7 @@ printf( "timespan_reltime- convert m%d s%f to %f [%d %d]\n", ...@@ -315,7 +315,7 @@ printf( "timespan_reltime- convert m%d s%f to %f [%d %d]\n",
#endif #endif
time = (((span > INT_MIN) && (span < INT_MAX))? span: INVALID_RELTIME); time = (((span > INT_MIN) && (span < INT_MAX))? span: INVALID_RELTIME);
}; }
return(time); return(time);
} /* timespan_reltime() */ } /* timespan_reltime() */
...@@ -341,7 +341,7 @@ reltime_timespan(RelativeTime reltime) ...@@ -341,7 +341,7 @@ reltime_timespan(RelativeTime reltime)
result->time = reltime; result->time = reltime;
result->month = ((12*year)+month); result->month = ((12*year)+month);
}; }
return(result); return(result);
} /* reltime_timespan() */ } /* reltime_timespan() */
...@@ -694,7 +694,7 @@ int isreltime(char *str) ...@@ -694,7 +694,7 @@ int isreltime(char *str)
default: default:
return 0; return 0;
break; break;
}; }
return 0; return 0;
} /* isreltime() */ } /* isreltime() */
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.12 1997/08/28 05:06:29 vadim Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.13 1997/09/05 18:11:10 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -95,7 +95,7 @@ printf( "date_in- input string is %s\n", str); ...@@ -95,7 +95,7 @@ printf( "date_in- input string is %s\n", str);
default: default:
elog(WARN,"Unrecognized date external representation %s",str); elog(WARN,"Unrecognized date external representation %s",str);
}; }
if (tm->tm_year < 0 || tm->tm_year > 32767) if (tm->tm_year < 0 || tm->tm_year > 32767)
elog(WARN, "date_in: year must be limited to values 0 through 32767 in '%s'", str); elog(WARN, "date_in: year must be limited to values 0 through 32767 in '%s'", str);
...@@ -186,7 +186,7 @@ date_cmp(DateADT dateVal1, DateADT dateVal2) ...@@ -186,7 +186,7 @@ date_cmp(DateADT dateVal1, DateADT dateVal2)
return -1; return -1;
} else if (dateVal1 > dateVal2) { } else if (dateVal1 > dateVal2) {
return 1; return 1;
}; }
return 0; return 0;
} /* date_cmp() */ } /* date_cmp() */
...@@ -281,7 +281,7 @@ datetime_date(DateTime *datetime) ...@@ -281,7 +281,7 @@ datetime_date(DateTime *datetime)
} else { } else {
if (datetime2tm( *datetime, &tz, tm, &fsec, &tzn) != 0) if (datetime2tm( *datetime, &tz, tm, &fsec, &tzn) != 0)
elog(WARN,"Unable to convert datetime to date",NULL); elog(WARN,"Unable to convert datetime to date",NULL);
}; }
result = (date2j( tm->tm_year, tm->tm_mon, tm->tm_mday) - date2j( 2000, 1, 1)); result = (date2j( tm->tm_year, tm->tm_mon, tm->tm_mday) - date2j( 2000, 1, 1));
...@@ -319,7 +319,7 @@ abstime_date(AbsoluteTime abstime) ...@@ -319,7 +319,7 @@ abstime_date(AbsoluteTime abstime)
abstime2tm(abstime, &tz, tm, NULL); abstime2tm(abstime, &tz, tm, NULL);
result = date2j(tm->tm_year,tm->tm_mon,tm->tm_mday) - date2j(2000,1,1); result = date2j(tm->tm_year,tm->tm_mon,tm->tm_mday) - date2j(2000,1,1);
break; break;
}; }
return(result); return(result);
} /* abstime_date() */ } /* abstime_date() */
...@@ -404,7 +404,7 @@ printf( "date2tm- convert %d-%d-%d %d:%d%d to datetime\n", ...@@ -404,7 +404,7 @@ printf( "date2tm- convert %d-%d-%d %d:%d%d to datetime\n",
*tzp = 0; *tzp = 0;
tm->tm_isdst = 0; tm->tm_isdst = 0;
if (tzn != NULL) *tzn = NULL; if (tzn != NULL) *tzn = NULL;
}; }
return 0; return 0;
} /* date2tm() */ } /* date2tm() */
...@@ -482,8 +482,8 @@ time_out(TimeADT *time) ...@@ -482,8 +482,8 @@ time_out(TimeADT *time)
sprintf(buf, "%02d:%02d:%02d", hour, min, sec); sprintf(buf, "%02d:%02d:%02d", hour, min, sec);
} else { } else {
sprintf(buf, "%02d:%02d:%05.2f", hour, min, (sec+fsec)); sprintf(buf, "%02d:%02d:%05.2f", hour, min, (sec+fsec));
}; }
}; }
#endif #endif
result = PALLOC(strlen(buf)+1); result = PALLOC(strlen(buf)+1);
...@@ -570,7 +570,7 @@ datetime_datetime(DateADT date, TimeADT *time) ...@@ -570,7 +570,7 @@ datetime_datetime(DateADT date, TimeADT *time)
} else { } else {
result = date_datetime(date); result = date_datetime(date);
*result += *time; *result += *time;
}; }
return(result); return(result);
} /* datetime_datetime() */ } /* datetime_datetime() */
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment