diff options
Diffstat (limited to 'src/backend')
| -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 | 6 | ||||
| -rw-r--r-- | src/backend/utils/sort/gen_qsort_tuple.pl | 2 |
4 files changed, 11 insertions, 9 deletions
diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c index 644e0f5fc73..eb01584a5f6 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 e991385059f..d09bc6d291a 100644 --- a/src/backend/optimizer/util/pathnode.c +++ b/src/backend/optimizer/util/pathnode.c @@ -3859,7 +3859,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 { \ @@ -3870,7 +3870,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 95f7d0538e0..aab5802edb4 100644 --- a/src/backend/utils/adt/formatting.c +++ b/src/backend/utils/adt/formatting.c @@ -479,7 +479,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,\ @@ -2731,11 +2731,13 @@ DCH_to_char(FormatNode *node, bool is_interval, TmToChar *in, char *out, Oid col str_numth(s, s, S_TH_TYPE(n->suffix)); s += strlen(s); break; + #define DCH_to_char_fsec(frac_fmt, frac_val) \ sprintf(s, frac_fmt, (int) (frac_val)); \ if (S_THth(n->suffix)) \ str_numth(s, s, S_TH_TYPE(n->suffix)); \ - s += strlen(s); + s += strlen(s) + case DCH_FF1: /* tenth of second */ DCH_to_char_fsec("%01d", in->fsec / 100000); break; diff --git a/src/backend/utils/sort/gen_qsort_tuple.pl b/src/backend/utils/sort/gen_qsort_tuple.pl index 9ed6cfc7eaa..eb0f7c5814f 100644 --- a/src/backend/utils/sort/gen_qsort_tuple.pl +++ b/src/backend/utils/sort/gen_qsort_tuple.pl @@ -126,7 +126,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) |