Skip to content

Commit a163545

Browse files
bmomjianbmomjian
committed
Cleanups needed for indent. Remove };
1 parent fe97d58 commit a163545

File tree

9 files changed

+253
-254
lines changed

9 files changed

+253
-254
lines changed

‎src/backend/catalog/heap.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.23 1997/09/04 13:17:59 vadim Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.24 1997/09/05 18:13:45 momjian Exp $
1111
*
1212
* INTERFACE ROUTINES
1313
* heap_creatr() - Create an uncataloged heap relation
@@ -262,7 +262,7 @@ heap_creatr(char *name,
262262
sprintf(tempname, "temp_%d", relid);
263263
relname = tempname;
264264
isTemp = 1;
265-
};
265+
}
266266
}
267267

268268
/* ----------------
@@ -1403,7 +1403,7 @@ InitTempRelList(void)
14031403
if (tempRels) {
14041404
free(tempRels->rels);
14051405
free(tempRels);
1406-
};
1406+
}
14071407

14081408
tempRels = (TempRelList*)malloc(sizeof(TempRelList));
14091409
tempRels->size = TEMP_REL_LIST_SIZE;

‎src/backend/optimizer/plan/planner.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.2 1996/10/31 10:59:15 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.3 1997/09/05 18:10:32 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -384,7 +384,6 @@ pg_checkretval(Oid rettype, QueryTreeList *queryTreeList)
384384
tletype = (Oid) ((Param*)thenode)->paramtype;
385385
else if (IsA(thenode,Expr)) {
386386
tletype = Expr
387-
}
388387
} else if (IsA(thenode,LispList)) {
389388
thenode = lfirst(thenode);
390389
if (IsA(thenode,Oper))

‎src/backend/optimizer/util/pathnode.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.2 1997/03/18 18:40:40 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.3 1997/09/05 18:10:36 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -218,7 +218,7 @@ create_seqscan_path(Rel *rel)
218218
#if 0
219219
if (XfuncMode != XFUNC_OFF) {
220220
pathnode->path_cost +=
221-
xfunc_get_path_cost(pathnode));
221+
xfunc_get_path_cost(pathnode);
222222
}
223223
#endif
224224
return (pathnode);

‎src/backend/parser/analyze.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.36 1997/09/01 05:56:34 thomas Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.37 1997/09/05 18:10:42 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1353,7 +1353,7 @@ make_targetlist_expr(ParseState *pstate,
13531353
} else
13541354
if (attrtype != type_id) {
13551355
if ((attrtype == INT2OID) && (type_id == INT4OID))
1356-
lfirst(expr) = lispInteger (INT2OID); do CASHOID too
1356+
lfirst(expr) = lispInteger (INT2OID); /* handle CASHOID too*/
13571357
else if ((attrtype == FLOAT4OID) && (type_id == FLOAT8OID))
13581358
lfirst(expr) = lispInteger (FLOAT4OID);
13591359
else

‎src/backend/storage/ipc/s_lock.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/s_lock.c,v 1.20 1997/08/24 23:07:28 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/s_lock.c,v 1.21 1997/09/05 18:10:54 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -481,19 +481,19 @@ S_INIT_LOCK(slock_t *lock)
481481

482482
static int tas_dummy()
483483
{
484-
__asm__("
485-
tas: /* r3 points to the location of p */
486-
lwarx 5,0,3 /* r5 = *p */
487-
cmpwi 5,0 /* r5 == 0 ? */
488-
bne fail /* if not 0, jump to fail */
489-
addi 5,5,1 /* set 1 to r5 */
490-
stwcx. 5,0,3 /* try update p atomically */
491-
beq success /* jump if scceed */
492-
fail: li 3,1 /* set 1 to r3 */
493-
blr
494-
success:
495-
li 3,0 /* set 0 to r3 */
496-
blr
484+
__asm__(" \n\
485+
tas: \n\
486+
lwarx 5,0,3 \n\
487+
cmpwi 5,0 \n\
488+
bne fail \n\
489+
addi 5,5,1 \n\
490+
stwcx. 5,0,3 \n\
491+
beq success \n\
492+
fail: li 3,1 \n\
493+
blr \n\
494+
success: \n\
495+
li 3,0 \n\
496+
blr \n\
497497
");
498498
}
499499

‎src/backend/utils/adt/date.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.13 1997/08/19 21:34:30 momjian Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.14 1997/09/05 18:11:05 momjian Exp $
1313
*
1414
* NOTES
1515
* 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)
144144

145145
default:
146146
return(INVALID_RELTIME);
147-
};
147+
}
148148

149149
elog(WARN,"Bad reltime (internal coding error) '%s'",str);
150150
return(INVALID_RELTIME);
@@ -166,7 +166,7 @@ char *reltimeout(int32 time)
166166
} else {
167167
reltime2tm(time, tm);
168168
EncodeTimeSpan( tm, 0, DateStyle, buf);
169-
};
169+
}
170170

171171
result = PALLOC(strlen(buf)+1);
172172
strcpy( result, buf);
@@ -305,7 +305,7 @@ timespan_reltime(TimeSpan *timespan)
305305
} else {
306306
year = 0;
307307
month = timespan->month;
308-
};
308+
}
309309

310310
span = (((((double) 365*year)+((double) 30*month))*86400) + timespan->time);
311311

@@ -315,7 +315,7 @@ printf( "timespan_reltime- convert m%d s%f to %f [%d %d]\n",
315315
#endif
316316

317317
time = (((span > INT_MIN) && (span < INT_MAX))? span: INVALID_RELTIME);
318-
};
318+
}
319319

320320
return(time);
321321
} /* timespan_reltime() */
@@ -341,7 +341,7 @@ reltime_timespan(RelativeTime reltime)
341341

342342
result->time = reltime;
343343
result->month = ((12*year)+month);
344-
};
344+
}
345345

346346
return(result);
347347
} /* reltime_timespan() */
@@ -694,7 +694,7 @@ int isreltime(char *str)
694694
default:
695695
return 0;
696696
break;
697-
};
697+
}
698698

699699
return 0;
700700
} /* isreltime() */

‎src/backend/utils/adt/datetime.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.12 1997/08/28 05:06:29 vadim Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.13 1997/09/05 18:11:10 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -95,7 +95,7 @@ printf( "date_in- input string is %s\n", str);
9595

9696
default:
9797
elog(WARN,"Unrecognized date external representation %s",str);
98-
};
98+
}
9999

100100
if (tm->tm_year < 0 || tm->tm_year > 32767)
101101
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)
186186
return -1;
187187
} else if (dateVal1 > dateVal2) {
188188
return 1;
189-
};
189+
}
190190
return 0;
191191
} /* date_cmp() */
192192

@@ -281,7 +281,7 @@ datetime_date(DateTime *datetime)
281281
} else {
282282
if (datetime2tm( *datetime, &tz, tm, &fsec, &tzn) != 0)
283283
elog(WARN,"Unable to convert datetime to date",NULL);
284-
};
284+
}
285285

286286
result = (date2j( tm->tm_year, tm->tm_mon, tm->tm_mday) - date2j( 2000, 1, 1));
287287

@@ -319,7 +319,7 @@ abstime_date(AbsoluteTime abstime)
319319
abstime2tm(abstime, &tz, tm, NULL);
320320
result = date2j(tm->tm_year,tm->tm_mon,tm->tm_mday) - date2j(2000,1,1);
321321
break;
322-
};
322+
}
323323

324324
return(result);
325325
} /* abstime_date() */
@@ -404,7 +404,7 @@ printf( "date2tm- convert %d-%d-%d %d:%d%d to datetime\n",
404404
*tzp = 0;
405405
tm->tm_isdst = 0;
406406
if (tzn != NULL) *tzn = NULL;
407-
};
407+
}
408408

409409
return 0;
410410
} /* date2tm() */
@@ -482,8 +482,8 @@ time_out(TimeADT *time)
482482
sprintf(buf, "%02d:%02d:%02d", hour, min, sec);
483483
} else {
484484
sprintf(buf, "%02d:%02d:%05.2f", hour, min, (sec+fsec));
485-
};
486-
};
485+
}
486+
}
487487
#endif
488488

489489
result = PALLOC(strlen(buf)+1);
@@ -570,7 +570,7 @@ datetime_datetime(DateADT date, TimeADT *time)
570570
} else {
571571
result = date_datetime(date);
572572
*result += *time;
573-
};
573+
}
574574

575575
return(result);
576576
} /* datetime_datetime() */

0 commit comments

Comments
 (0)