7
7
*
8
8
*
9
9
* IDENTIFICATION
10
- * $PostgreSQL: pgsql/src/backend/catalog/pg_enum.c,v 1.10 2009/12/19 00:47:57 momjian Exp $
10
+ * $PostgreSQL: pgsql/src/backend/catalog/pg_enum.c,v 1.11 2009/12/24 22:17:58 momjian Exp $
11
11
*
12
12
*-------------------------------------------------------------------------
13
13
*/
@@ -39,14 +39,14 @@ EnumValuesCreate(Oid enumTypeOid, List *vals)
39
39
TupleDesc tupDesc ;
40
40
NameData enumlabel ;
41
41
Oid * oids ;
42
- int i ,
43
- n ;
42
+ int elemno ,
43
+ num_elems ;
44
44
Datum values [Natts_pg_enum ];
45
45
bool nulls [Natts_pg_enum ];
46
46
ListCell * lc ;
47
47
HeapTuple tup ;
48
48
49
- n = list_length (vals );
49
+ num_elems = list_length (vals );
50
50
51
51
/*
52
52
* XXX we do not bother to check the list of values for duplicates --- if
@@ -64,23 +64,23 @@ EnumValuesCreate(Oid enumTypeOid, List *vals)
64
64
* counter wraps all the way around before we finish. Which seems
65
65
* unlikely.
66
66
*/
67
- oids = (Oid * ) palloc (n * sizeof (Oid ));
68
- for (i = 0 ; i < n ; i ++ )
67
+ oids = (Oid * ) palloc (num_elems * sizeof (Oid ));
68
+ for (elemno = 0 ; elemno < num_elems ; elemno ++ )
69
69
{
70
70
/*
71
71
* The pg_enum.oid is stored in user tables. This oid must be
72
72
* preserved by binary upgrades.
73
73
*/
74
- oids [i ] = GetNewOid (pg_enum );
74
+ oids [elemno ] = GetNewOid (pg_enum );
75
75
}
76
76
77
77
/* sort them, just in case counter wrapped from high to low */
78
- qsort (oids , n , sizeof (Oid ), oid_cmp );
78
+ qsort (oids , num_elems , sizeof (Oid ), oid_cmp );
79
79
80
80
/* and make the entries */
81
81
memset (nulls , false, sizeof (nulls ));
82
82
83
- i = 0 ;
83
+ elemno = 0 ;
84
84
foreach (lc , vals )
85
85
{
86
86
char * lab = strVal (lfirst (lc ));
@@ -101,13 +101,13 @@ EnumValuesCreate(Oid enumTypeOid, List *vals)
101
101
values [Anum_pg_enum_enumlabel - 1 ] = NameGetDatum (& enumlabel );
102
102
103
103
tup = heap_form_tuple (tupDesc , values , nulls );
104
- HeapTupleSetOid (tup , oids [i ]);
104
+ HeapTupleSetOid (tup , oids [elemno ]);
105
105
106
106
simple_heap_insert (pg_enum , tup );
107
107
CatalogUpdateIndexes (pg_enum , tup );
108
108
heap_freetuple (tup );
109
109
110
- i ++ ;
110
+ elemno ++ ;
111
111
}
112
112
113
113
/* clean up */
0 commit comments