summaryrefslogtreecommitdiff
path: root/src/include/c.h
diff options
context:
space:
mode:
authorTom Lane2015-02-20 05:11:42 +0000
committerTom Lane2015-02-20 05:11:42 +0000
commit09d8d110a604e52216102e73fb8475b7aa88f1d1 (patch)
tree6ffdaba34c52c319aa32b3cb95cc93cdcefb6d65 /src/include/c.h
parent2fb7a75f37d0beca80f45e15736ec8d50064228a (diff)
Use FLEXIBLE_ARRAY_MEMBER in a bunch more places.
Replace some bogus "x[1]" declarations with "x[FLEXIBLE_ARRAY_MEMBER]". Aside from being more self-documenting, this should help prevent bogus warnings from static code analyzers and perhaps compiler misoptimizations. This patch is just a down payment on eliminating the whole problem, but it gets rid of a lot of easy-to-fix cases. Note that the main problem with doing this is that one must no longer rely on computing sizeof(the containing struct), since the result would be compiler-dependent. Instead use offsetof(struct, lastfield). Autoconf also warns against spelling that offsetof(struct, lastfield[0]). Michael Paquier, review and additional fixes by me.
Diffstat (limited to 'src/include/c.h')
-rw-r--r--src/include/c.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/include/c.h b/src/include/c.h
index b187520973..2de86f9141 100644
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -424,8 +424,8 @@ typedef struct
Oid elemtype;
int dim1;
int lbound1;
- int16 values[1]; /* VARIABLE LENGTH ARRAY */
-} int2vector; /* VARIABLE LENGTH STRUCT */
+ int16 values[FLEXIBLE_ARRAY_MEMBER];
+} int2vector;
typedef struct
{
@@ -435,8 +435,8 @@ typedef struct
Oid elemtype;
int dim1;
int lbound1;
- Oid values[1]; /* VARIABLE LENGTH ARRAY */
-} oidvector; /* VARIABLE LENGTH STRUCT */
+ Oid values[FLEXIBLE_ARRAY_MEMBER];
+} oidvector;
/*
* Representation of a Name: effectively just a C string, but null-padded to