diff options
Diffstat (limited to 'src/backend/utils/adt')
| -rw-r--r-- | src/backend/utils/adt/acl.c | 11 | ||||
| -rw-r--r-- | src/backend/utils/adt/arrayfuncs.c | 5 | ||||
| -rw-r--r-- | src/backend/utils/adt/inet_net_pton.c | 3 | ||||
| -rw-r--r-- | src/backend/utils/adt/regexp.c | 5 |
4 files changed, 10 insertions, 14 deletions
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c index 15c590dc811..5e862ea6efd 100644 --- a/src/backend/utils/adt/acl.c +++ b/src/backend/utils/adt/acl.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.31 1998/09/01 04:32:23 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.32 1999/02/03 21:17:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -445,16 +445,13 @@ aclinsert3(Acl *old_acl, AclItem *mod_aip, unsigned modechg) switch (modechg) { case ACL_MODECHG_ADD: - new_aip[dst].ai_mode = - old_aip[src].ai_mode | mod_aip->ai_mode; + new_aip[dst].ai_mode = old_aip[src].ai_mode | mod_aip->ai_mode; break; case ACL_MODECHG_DEL: - new_aip[dst].ai_mode = - old_aip[src].ai_mode & ~mod_aip->ai_mode; + new_aip[dst].ai_mode = old_aip[src].ai_mode & ~mod_aip->ai_mode; break; case ACL_MODECHG_EQL: - new_aip[dst].ai_mode = - mod_aip->ai_mode; + new_aip[dst].ai_mode = mod_aip->ai_mode; break; } diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c index b718ce01367..4cf840cfa90 100644 --- a/src/backend/utils/adt/arrayfuncs.c +++ b/src/backend/utils/adt/arrayfuncs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.36 1999/01/17 21:12:55 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.37 1999/02/03 21:17:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -196,8 +196,7 @@ array_in(char *string, /* input array in external form */ if (*p == '{') { /* array not a large object */ - dataPtr = - (char *) _ReadArrayStr(p, nitems, ndim, dim, &inputproc, typelem, + dataPtr = (char *) _ReadArrayStr(p, nitems, ndim, dim, &inputproc, typelem, typmod, typdelim, typlen, typbyval, typalign, &nbytes); nbytes += ARR_OVERHEAD(ndim); diff --git a/src/backend/utils/adt/inet_net_pton.c b/src/backend/utils/adt/inet_net_pton.c index bd07e32fd22..ae3036c3ca6 100644 --- a/src/backend/utils/adt/inet_net_pton.c +++ b/src/backend/utils/adt/inet_net_pton.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: inet_net_pton.c,v 1.6 1998/10/22 13:16:26 momjian Exp $"; +static const char rcsid[] = "$Id: inet_net_pton.c,v 1.7 1999/02/03 21:17:27 momjian Exp $"; #endif @@ -113,6 +113,7 @@ inet_cidr_pton_ipv4(const char *src, u_char *dst, size_t size) if (size <= 0) goto emsgsize; dirty = 0; + tmp = 0; src++; /* skip x or X. */ while ((ch = *src++) != '\0' && isascii(ch) && isxdigit(ch)) { if (isupper(ch)) diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c index 6efb350266f..bb24dff2e8b 100644 --- a/src/backend/utils/adt/regexp.c +++ b/src/backend/utils/adt/regexp.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.20 1998/09/01 04:32:46 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.21 1999/02/03 21:17:28 momjian Exp $ * * Alistair Crooks added the code for the regex caching * agc - cached the regular expressions used - there's a good chance @@ -108,8 +108,7 @@ RE_compile_and_execute(struct varlena * text_re, char *text, int cflags) { for (lru = i = 0; i < rec; i++) { - rev[i].cre_lru = - (rev[i].cre_lru - rev[oldest].cre_lru) / 2; + rev[i].cre_lru = (rev[i].cre_lru - rev[oldest].cre_lru) / 2; if (rev[i].cre_lru > lru) lru = rev[i].cre_lru; } |