Skip to content

Commit a3c5a3c

Browse files
bmomjianbmomjian
committed
Cleanup for oid8[] from Tatsuo Ishii.
1 parent 738dc87 commit a3c5a3c

File tree

6 files changed

+44
-44
lines changed

6 files changed

+44
-44
lines changed

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

Lines changed: 4 additions & 6 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/tlist.c,v 1.18 1998/09/01 04:30:12 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.19 1998/09/22 20:28:07 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -429,11 +429,9 @@ flatten_tlist_vars(List *full_tlist, List *flat_tlist)
429429
{
430430
TargetEntry *tle = lfirst(x);
431431

432-
result =
433-
lappend(result,
434-
makeTargetEntry(tle->resdom,
435-
flatten_tlistentry((Node *) get_expr(tle),
436-
flat_tlist)));
432+
result = lappend(result, makeTargetEntry(tle->resdom,
433+
flatten_tlistentry((Node *) get_expr(tle),
434+
flat_tlist)));
437435
}
438436

439437
return result;

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

Lines changed: 17 additions & 16 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/int.c,v 1.18 1998/09/01 06:22:43 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.19 1998/09/22 20:28:09 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -80,34 +80,35 @@ int2out(int16 sh)
8080
int16 *
8181
int28in(char *shs)
8282
{
83-
int16 (*result)[];
83+
int16 *result;
8484
int nums;
8585

8686
if (shs == NULL)
8787
return NULL;
88-
result = (int16 (*)[]) palloc(sizeof(int16[8]));
88+
89+
result = (int16 *) palloc(sizeof(int16[8]));
8990
if ((nums = sscanf(shs, "%hd%hd%hd%hd%hd%hd%hd%hd",
90-
*result,
91-
*result + 1,
92-
*result + 2,
93-
*result + 3,
94-
*result + 4,
95-
*result + 5,
96-
*result + 6,
97-
*result + 7)) != 8)
91+
&result[0],
92+
&result[1],
93+
&result[2],
94+
&result[3],
95+
&result[4],
96+
&result[5],
97+
&result[6],
98+
&result[7])) != 8)
9899
{
99100
do
100-
(*result)[nums++] = 0;
101+
result[nums++] = 0;
101102
while (nums < 8);
102103
}
103-
return (int16 *) result;
104+
return result;
104105
}
105106

106107
/*
107108
* int28out - converts internal form to "num num ..."
108109
*/
109110
char *
110-
int28out(int16 (*shs)[])
111+
int28out(int16 *shs)
111112
{
112113
int num;
113114
int16 *sp;
@@ -123,7 +124,7 @@ int28out(int16 (*shs)[])
123124
}
124125
rp = result = (char *) palloc(8 * 7); /* assumes sign, 5 digits,
125126
* ' ' */
126-
sp = *shs;
127+
sp = shs;
127128
for (num = 8; num != 0; num--)
128129
{
129130
itoa(*sp++, rp);
@@ -136,7 +137,7 @@ int28out(int16 (*shs)[])
136137
}
137138

138139
/*
139-
* int28in - converts "num num ..." to internal form
140+
* int44in - converts "num num ..." to internal form
140141
*
141142
* Note:
142143
* Fills any nonexistent digits with NULLs.

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

Lines changed: 16 additions & 15 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/oid.c,v 1.19 1998/09/01 05:34:14 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.20 1998/09/22 20:28:10 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -31,34 +31,35 @@
3131
Oid *
3232
oid8in(char *oidString)
3333
{
34-
Oid (*result)[];
34+
Oid *result;
3535
int nums;
3636

3737
if (oidString == NULL)
3838
return NULL;
39-
result = (Oid (*)[]) palloc(sizeof(Oid[8]));
39+
40+
result = (Oid *) palloc(sizeof(Oid[8]));
4041
if ((nums = sscanf(oidString, "%d%d%d%d%d%d%d%d",
41-
&(*result)[0],
42-
&(*result)[1],
43-
&(*result)[2],
44-
&(*result)[3],
45-
&(*result)[4],
46-
&(*result)[5],
47-
&(*result)[6],
48-
&(*result)[7])) != 8)
42+
&result[0],
43+
&result[1],
44+
&result[2],
45+
&result[3],
46+
&result[4],
47+
&result[5],
48+
&result[6],
49+
&result[7])) != 8)
4950
{
5051
do
51-
(*result)[nums++] = 0;
52+
result[nums++] = 0;
5253
while (nums < 8);
5354
}
54-
return (Oid *) result;
55+
return result;
5556
}
5657

5758
/*
5859
* oid8out - converts internal form to "num num ..."
5960
*/
6061
char *
61-
oid8out(Oid (*oidArray)[])
62+
oid8out(Oid *oidArray)
6263
{
6364
int num;
6465
Oid *sp;
@@ -75,7 +76,7 @@ oid8out(Oid (*oidArray)[])
7576

7677
/* assumes sign, 10 digits, ' ' */
7778
rp = result = (char *) palloc(8 * 12);
78-
sp = *oidArray;
79+
sp = oidArray;
7980
for (num = 8; num != 0; num--)
8081
{
8182
ltoa(*sp++, rp);

‎src/backend/utils/adt/regproc.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/utils/adt/regproc.c,v 1.27 1998/09/18 04:43:18 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.28 1998/09/22 20:28:11 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -211,7 +211,7 @@ regprocout(RegProcedure proid)
211211
* int8typeout - converts int8 type oids to "typname" list
212212
*/
213213
text *
214-
oid8types(Oid (*oidArray)[])
214+
oid8types(Oid *oidArray)
215215
{
216216
HeapTuple typetup;
217217
text *result;

‎src/include/utils/builtins.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: builtins.h,v 1.54 1998/09/18 04:43:20 momjian Exp $
9+
* $Id: builtins.h,v 1.55 1998/09/22 20:28:13 momjian Exp $
1010
*
1111
* NOTES
1212
* This should normally only be included by fmgr.h.
@@ -64,7 +64,7 @@ extern bool cideq(int8 arg1, int8 arg2);
6464
extern int32 int2in(char *num);
6565
extern char *int2out(int16 sh);
6666
extern int16 *int28in(char *shs);
67-
extern char *int28out(int16 (*shs)[]);
67+
extern char *int28out(int16 *shs);
6868
extern int32 *int44in(char *input_string);
6969
extern char *int44out(int32 *an_array);
7070
extern int32 int4in(char *num);
@@ -329,7 +329,7 @@ extern bool oidnotin(Oid the_oid, char *compare);
329329

330330
/* oid.c */
331331
extern Oid *oid8in(char *oidString);
332-
extern char *oid8out(Oid (*oidArray)[]);
332+
extern char *oid8out(Oid *oidArray);
333333
extern Oid oidin(char *s);
334334
extern char *oidout(Oid o);
335335
extern bool oideq(Oid arg1, Oid arg2);
@@ -358,7 +358,7 @@ extern bool texticregexne(struct varlena * s, struct varlena * p);
358358
/* regproc.c */
359359
extern int32 regprocin(char *pro_name_and_oid);
360360
extern char *regprocout(RegProcedure proid);
361-
extern text *oid8types(Oid (*oidArray)[]);
361+
extern text *oid8types(Oid *oidArray);
362362
extern Oid regproctooid(RegProcedure rp);
363363

364364
/* define macro to replace mixed-case function call - tgl 97/04/27 */

‎src/interfaces/libpq++/pgenv.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#ifndef PGENV_H
1919
#define PGENV_H
2020

21-
#include <string.h>
21+
#include <string>
2222

2323

2424
//

0 commit comments

Comments
 (0)