diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/nodes/readfuncs.c | 8 | ||||
| -rw-r--r-- | src/backend/optimizer/util/pathnode.c | 4 | ||||
| -rw-r--r-- | src/backend/utils/adt/formatting.c | 2 | ||||
| -rw-r--r-- | src/backend/utils/sort/gen_qsort_tuple.pl | 2 | ||||
| -rw-r--r-- | src/bin/pg_dump/pg_backup_archiver.h | 2 | ||||
| -rw-r--r-- | src/include/access/hash.h | 2 | ||||
| -rw-r--r-- | src/include/access/nbtree.h | 2 | ||||
| -rw-r--r-- | src/port/qsort.c | 2 | ||||
| -rw-r--r-- | src/port/qsort_arg.c | 2 |
9 files changed, 13 insertions, 13 deletions
diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c index 764e3bb90c9..7257e20cd59 100644 --- a/src/backend/nodes/readfuncs.c +++ b/src/backend/nodes/readfuncs.c @@ -154,22 +154,22 @@ /* Read an attribute number array */ #define READ_ATTRNUMBER_ARRAY(fldname, len) \ token = pg_strtok(&length); /* skip :fldname */ \ - local_node->fldname = readAttrNumberCols(len); + local_node->fldname = readAttrNumberCols(len) /* Read an oid array */ #define READ_OID_ARRAY(fldname, len) \ token = pg_strtok(&length); /* skip :fldname */ \ - local_node->fldname = readOidCols(len); + local_node->fldname = readOidCols(len) /* Read an int array */ #define READ_INT_ARRAY(fldname, len) \ token = pg_strtok(&length); /* skip :fldname */ \ - local_node->fldname = readIntCols(len); + local_node->fldname = readIntCols(len) /* Read a bool array */ #define READ_BOOL_ARRAY(fldname, len) \ token = pg_strtok(&length); /* skip :fldname */ \ - local_node->fldname = readBoolCols(len); + local_node->fldname = readBoolCols(len) /* Routine exit */ #define READ_DONE() \ diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c index d884d2bb000..2d15a9b7b0e 100644 --- a/src/backend/optimizer/util/pathnode.c +++ b/src/backend/optimizer/util/pathnode.c @@ -3825,7 +3825,7 @@ do { \ (path) = reparameterize_path_by_child(root, (path), child_rel); \ if ((path) == NULL) \ return NULL; \ -} while(0); +} while(0) #define REPARAMETERIZE_CHILD_PATH_LIST(pathlist) \ do { \ @@ -3836,7 +3836,7 @@ do { \ if ((pathlist) == NIL) \ return NULL; \ } \ -} while(0); +} while(0) Path *new_path; ParamPathInfo *new_ppi; diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c index 51e1b28242c..4cdcc16f722 100644 --- a/src/backend/utils/adt/formatting.c +++ b/src/backend/utils/adt/formatting.c @@ -440,7 +440,7 @@ typedef struct (_X)->mode, (_X)->hh, (_X)->pm, (_X)->mi, (_X)->ss, (_X)->ssss, \ (_X)->d, (_X)->dd, (_X)->ddd, (_X)->mm, (_X)->ms, (_X)->year, \ (_X)->bc, (_X)->ww, (_X)->w, (_X)->cc, (_X)->j, (_X)->us, \ - (_X)->yysz, (_X)->clock); + (_X)->yysz, (_X)->clock) #define DEBUG_TM(_X) \ elog(DEBUG_elog_output, "TM:\nsec %d\nyear %d\nmin %d\nwday %d\nhour %d\nyday %d\nmday %d\nnisdst %d\nmon %d\n",\ (_X)->tm_sec, (_X)->tm_year,\ diff --git a/src/backend/utils/sort/gen_qsort_tuple.pl b/src/backend/utils/sort/gen_qsort_tuple.pl index b6b2ffa7d0b..ddd71d0c24b 100644 --- a/src/backend/utils/sort/gen_qsort_tuple.pl +++ b/src/backend/utils/sort/gen_qsort_tuple.pl @@ -125,7 +125,7 @@ swapfunc(SortTuple *a, SortTuple *b, size_t n) SortTuple t = *(a); \ *(a) = *(b); \ *(b) = t; \ - } while (0); + } while (0) #define vecswap(a, b, n) if ((n) > 0) swapfunc(a, b, n) diff --git a/src/bin/pg_dump/pg_backup_archiver.h b/src/bin/pg_dump/pg_backup_archiver.h index aca03381ddd..776892efb9f 100644 --- a/src/bin/pg_dump/pg_backup_archiver.h +++ b/src/bin/pg_dump/pg_backup_archiver.h @@ -100,7 +100,7 @@ typedef z_stream *z_streamp; #define K_VERS_MAJOR 1 #define K_VERS_MINOR 14 #define K_VERS_REV 0 -#define K_VERS_SELF MAKE_ARCHIVE_VERSION(K_VERS_MAJOR, K_VERS_MINOR, K_VERS_REV); +#define K_VERS_SELF MAKE_ARCHIVE_VERSION(K_VERS_MAJOR, K_VERS_MINOR, K_VERS_REV) /* Newest format we can read */ #define K_VERS_MAX MAKE_ARCHIVE_VERSION(K_VERS_MAJOR, K_VERS_MINOR, 255) diff --git a/src/include/access/hash.h b/src/include/access/hash.h index 107c3d01ae4..52a2818340f 100644 --- a/src/include/access/hash.h +++ b/src/include/access/hash.h @@ -148,7 +148,7 @@ typedef struct HashScanPosData (scanpos).firstItem = 0; \ (scanpos).lastItem = 0; \ (scanpos).itemIndex = 0; \ - } while (0); + } while (0) /* * HashScanOpaqueData is private state for a hash index scan. diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h index e8b7a5fde19..8f81663e5c0 100644 --- a/src/include/access/nbtree.h +++ b/src/include/access/nbtree.h @@ -614,7 +614,7 @@ typedef BTScanPosData *BTScanPos; (scanpos).buf = InvalidBuffer; \ (scanpos).lsn = InvalidXLogRecPtr; \ (scanpos).nextTupleOffset = 0; \ - } while (0); + } while (0) /* We need one of these for each equality-type SK_SEARCHARRAY scan key */ typedef struct BTArrayKeyInfo diff --git a/src/port/qsort.c b/src/port/qsort.c index 409f69a128b..fa992e2081d 100644 --- a/src/port/qsort.c +++ b/src/port/qsort.c @@ -80,7 +80,7 @@ do { \ } while (0) #define SWAPINIT(a, es) swaptype = ((char *)(a) - (char *)0) % sizeof(long) || \ - (es) % sizeof(long) ? 2 : (es) == sizeof(long)? 0 : 1; + (es) % sizeof(long) ? 2 : (es) == sizeof(long)? 0 : 1 static void swapfunc(char *a, char *b, size_t n, int swaptype) diff --git a/src/port/qsort_arg.c b/src/port/qsort_arg.c index a2194b0fb18..6d54fbc2b42 100644 --- a/src/port/qsort_arg.c +++ b/src/port/qsort_arg.c @@ -80,7 +80,7 @@ do { \ } while (0) #define SWAPINIT(a, es) swaptype = ((char *)(a) - (char *)0) % sizeof(long) || \ - (es) % sizeof(long) ? 2 : (es) == sizeof(long)? 0 : 1; + (es) % sizeof(long) ? 2 : (es) == sizeof(long)? 0 : 1 static void swapfunc(char *a, char *b, size_t n, int swaptype) |