sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-31 00:01:57 -04:00
Code Issues Projects Releases Wiki Activity

Use more-portable coding for the check on handing out the last available

Browse Source 
relopt_kind value in add_reloption_kind().  Per Zdenek Kotala.
This commit is contained in:
Tom Lane 2009-05-24 22:22:44 +00:00
parent fc2660fc25
commit c3707a4fcd
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/backend/access/common/reloptions.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/access/common/reloptions.c,v 1.26 2009/04/04 21:12:30 tgl Exp $ * $PostgreSQL: pgsql/src/backend/access/common/reloptions.c,v 1.27 2009/05/24 22:22:44 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -190,7 +190,7 @@ static relopt_string stringRelOpts[] =
}; };
static relopt_gen **relOpts = NULL; static relopt_gen **relOpts = NULL;
static bits32 last_assigned_kind = RELOPT_KIND_LAST_DEFAULT << 1; static bits32 last_assigned_kind = RELOPT_KIND_LAST_DEFAULT;
static int num_custom_options = 0; static int num_custom_options = 0;
static relopt_gen **custom_options = NULL; static relopt_gen **custom_options = NULL;
@ -278,17 +278,13 @@ initialize_reloptions(void)
relopt_kind relopt_kind
add_reloption_kind(void) add_reloption_kind(void)
{ {
relopt_kind kind; /* don't hand out the last bit so that the enum's behavior is portable */
/* don't hand out the last bit so that the wraparound check is portable */
if (last_assigned_kind >= RELOPT_KIND_MAX) if (last_assigned_kind >= RELOPT_KIND_MAX)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
errmsg("user-defined relation parameter types limit exceeded"))); errmsg("user-defined relation parameter types limit exceeded")));
kind = (relopt_kind) last_assigned_kind;
last_assigned_kind <<= 1; last_assigned_kind <<= 1;
return kind; return (relopt_kind) last_assigned_kind;
} }
/* /*

5
src/include/access/reloptions.h
View File

@ -11,7 +11,7 @@
* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/include/access/reloptions.h,v 1.14 2009/04/04 00:45:02 alvherre Exp $ * $PostgreSQL: pgsql/src/include/access/reloptions.h,v 1.15 2009/05/24 22:22:44 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -41,7 +41,8 @@ typedef enum relopt_kind
RELOPT_KIND_GIST = (1 << 5), RELOPT_KIND_GIST = (1 << 5),
/* if you add a new kind, make sure you update "last_default" too */ /* if you add a new kind, make sure you update "last_default" too */
RELOPT_KIND_LAST_DEFAULT = RELOPT_KIND_GIST, RELOPT_KIND_LAST_DEFAULT = RELOPT_KIND_GIST,
RELOPT_KIND_MAX = (1 << 31) /* some compilers treat enums as signed ints, so we can't use 1 << 31 */
RELOPT_KIND_MAX = (1 << 30)
} relopt_kind; } relopt_kind;
/* reloption namespaces allowed for heaps -- currently only TOAST */ /* reloption namespaces allowed for heaps -- currently only TOAST */