database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-10 17:42:29 +03:00
Code Activity

Fix pgproc names over 15 chars in output. Add strNcpy() function. remove some (void) casts that are unnecessary.

Browse Source
This commit is contained in:
Bruce Momjian
1997-08-12 20:16:25 +00:00
parent 4b851b1cfc
commit edb58721b8
44 changed files with 163 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/backend/utils/adt/acl.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.11 1997/08/03 02:36:41 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.12 1997/08/12 20:15:54 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -245,17 +245,17 @@ aclitemout(AclItem *aip)
elog(NOTICE, "aclitemout: usesysid %d not found",
aip->ai_id);
(void) strcat(p, tmp);
strcat(p, tmp);
pfree(tmp);
} else
(void) strncat(p, (char *) &((Form_pg_user)
strncat(p, (char *) &((Form_pg_user)
GETSTRUCT(htp))->usename,
sizeof(NameData));
break;
case ACL_IDTYPE_GID:
(void) strcat(p, "group ");
strcat(p, "group ");
tmpname = get_groname(aip->ai_id);
(void) strncat(p, tmpname, NAMEDATALEN);
strncat(p, tmpname, NAMEDATALEN);
break;
case ACL_IDTYPE_WORLD:
break;

18
src/backend/utils/adt/char.c
View File

@@ -12,7 +12,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.5 1997/06/11 05:17:58 vadim Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.6 1997/08/12 20:15:55 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -265,8 +265,7 @@ uint32 char4in(char *s)
if (s == NULL)
return(0);
memset((char *) &res, 0, sizeof(res));
(void) strncpy((char *) &res, s, 4);
strncpy((char *) &res, s, 4);
return(res);
}
@@ -276,8 +275,7 @@ char *char4out(s)
{
char *result = (char *) palloc(5);
memset(result, 0, 5);
(void) strncpy(result, (char *) &s, 4);
strNcpy(result, (char *) &s, 4);
return(result);
}
@@ -326,8 +324,7 @@ char *char8in(char *s)
return((char *) NULL);
result = (char *) palloc(8);
memset(result, 0, 8);
(void) strncpy(result, s, 8);
strncpy(result, s, 8);
return(result);
}
@@ -335,12 +332,11 @@ char *char8out(char *s)
{
char *result = (char *) palloc(9);
memset(result, 0, 9);
if (s == NULL) {
result[0] = '-';
} else {
strncpy(result, s, 8);
}
result[1] = '\0';
} else
strNcpy(result, s, 8);
return(result);
}

18
src/backend/utils/adt/date.c
View File

@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.10 1997/07/29 15:54:49 thomas Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.11 1997/08/12 20:15:57 momjian Exp $
*
* NOTES
* This code is actually (almost) unused.
@@ -200,7 +200,7 @@ reltime2tm(int32 time, struct tm *tm)
timestring = (char *) palloc(Max(strlen(INVALID_RELTIME_STR),
UNITMAXLEN) + 1);
if (timevalue == INVALID_RELTIME) {
(void) strcpy(timestring,INVALID_RELTIME_STR);
strcpy(timestring,INVALID_RELTIME_STR);
return(timestring);
}
if (timevalue == 0)
@@ -259,19 +259,19 @@ char *tintervalout(TimeInterval interval)
char *i_str, *p;
i_str = (char *) palloc( T_INTERVAL_LEN ); /* ['...' '...'] */
(void) strcpy(i_str,"[\"");
strcpy(i_str,"[\"");
if (interval->status == T_INTERVAL_INVAL)
(void) strcat(i_str,INVALID_INTERVAL_STR);
strcat(i_str,INVALID_INTERVAL_STR);
else {
p = nabstimeout(interval->data[0]);
(void) strcat(i_str,p);
strcat(i_str,p);
pfree(p);
(void) strcat(i_str,"\" \"");
strcat(i_str,"\" \"");
p = nabstimeout(interval->data[1]);
(void) strcat(i_str,p);
strcat(i_str,p);
pfree(p);
}
(void) strcat(i_str,"\"]\0");
strcat(i_str,"\"]\0");
return(i_str);
}
@@ -963,7 +963,7 @@ timeofday(void)
int len = 0;
gettimeofday(&tp, &tpz);
(void) strftime(templ, sizeof(templ), "%a %b %d %H:%M:%S.%%d %Y %Z",
strftime(templ, sizeof(templ), "%a %b %d %H:%M:%S.%%d %Y %Z",
localtime((time_t *) &tp.tv_sec));
sprintf(buf, templ, tp.tv_usec);

8
src/backend/utils/adt/filename.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.7 1997/07/24 20:16:11 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.8 1997/08/12 20:15:58 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -63,8 +63,7 @@ filename_in(char *file)
len = strlen(name);
} else {
len = (p - file) - 1;
strncpy(name, file+1, len);
name[len] = '\0';
strNcpy(name, file+1, len);
}
/*printf("name: %s\n");*/
if ((pw = getpwnam(name)) == NULL) {
@@ -84,8 +83,7 @@ filename_in(char *file)
len = strlen(environment);
} else {
len = (p - file) - 1;
strncpy(environment, file+1, len);
environment[len] = '\0';
strNcpy(environment, file+1, len);
}
envirp = getenv(environment);
if (envirp) {

5
src/backend/utils/adt/like.c
View File

@@ -45,8 +45,7 @@ fixedlen_like(char *s, struct varlena* p, int charlen)
/* be sure sterm is null-terminated */
sterm = (char *) palloc(charlen + 1);
memset(sterm, 0, charlen + 1);
strncpy(sterm, s, charlen);
strNcpy(sterm, s, charlen);
/* p is a text = varlena, not a string so we have to make
* a string from the vl_data field of the struct. */
@@ -140,7 +139,7 @@ bool textnlike(struct varlena *s, struct varlena *p)
}
/* $Revision: 1.4 $
/* $Revision: 1.5 $
** "like.c" A first attempt at a LIKE operator for Postgres95.
**
** Originally written by Rich $alz, mirror!rs, Wed Nov 26 19:03:17 EST 1986.

12
src/backend/utils/adt/nabstime.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.28 1997/07/08 22:06:46 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.29 1997/08/12 20:16:00 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -286,11 +286,11 @@ nabstimeout(AbsoluteTime time)
char zone[MAXDATELEN+1], *tzn = zone;
switch (time) {
case EPOCH_ABSTIME: (void) strcpy(buf, EPOCH); break;
case INVALID_ABSTIME: (void) strcpy(buf, INVALID); break;
case CURRENT_ABSTIME: (void) strcpy(buf, DCURRENT); break;
case NOEND_ABSTIME: (void) strcpy(buf, LATE); break;
case NOSTART_ABSTIME: (void) strcpy(buf, EARLY); break;
case EPOCH_ABSTIME: strcpy(buf, EPOCH); break;
case INVALID_ABSTIME: strcpy(buf, INVALID); break;
case CURRENT_ABSTIME: strcpy(buf, DCURRENT); break;
case NOEND_ABSTIME: strcpy(buf, LATE); break;
case NOSTART_ABSTIME: strcpy(buf, EARLY); break;
default:
abstime2tm( time, &tz, tm, tzn);
#if DATEDEBUG

10
src/backend/utils/adt/name.c
View File

@@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.3 1997/08/03 02:36:57 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.4 1997/08/12 20:16:01 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -39,8 +39,7 @@ NameData *namein(char *s)
return(NULL);
result = (NameData*) palloc(NAMEDATALEN);
/* always keep it null-padded */
(void) strncpy(result->data, s, NAMEDATALEN);
result->data[NAMEDATALEN-1] = '\0';
strNcpy(result->data, s, NAMEDATALEN-1);
return(result);
}
@@ -126,7 +125,7 @@ int namecpy(Name n1, Name n2)
{
if (!n1 || !n2)
return(-1);
(void) strncpy(n1->data, n2->data, NAMEDATALEN);
strncpy(n1->data, n2->data, NAMEDATALEN);
return(0);
}
@@ -145,8 +144,7 @@ namestrcpy(Name name, char *str)
{
if (!name || !str)
return(-1);
(void) strncpy(name->data, str, NAMEDATALEN);
name->data[NAMEDATALEN-1] = '\0';
strNcpy(name->data, str, NAMEDATALEN-1);
return(0);
}

4
src/backend/utils/adt/numutils.c
View File

@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.10 1997/04/22 17:47:14 scrappy Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.11 1997/08/12 20:16:02 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -149,7 +149,7 @@ ftoa(double value, char *ascii, int width, int prec1, char format)
ascii[width] = 0;
return(0);
}
(void) strcpy(ascii, out);
strcpy(ascii, out);
return(ret);
#else
auto int expon;

6
src/backend/utils/adt/oidname.c
View File

@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/oidname.c,v 1.3 1997/08/03 02:37:08 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/oidname.c,v 1.4 1997/08/12 20:16:03 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -35,8 +35,8 @@ oidnamein(char *inStr)
if (*inptr) {
oc->id = (Oid) pg_atoi(inStr, sizeof(Oid), ',');
/* copy one less to ensure null-padding */
strncpy(oc->name.data,++inptr,NAMEDATALEN);
/* namestrcpy(&oc->name, ++inptr); */
++inptr;
strNcpy(oc->name.data,inptr,NAMEDATALEN-1);
}else
elog(WARN, "Bad input data for type oidname");

5
src/backend/utils/adt/regexp.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.5 1996/11/10 01:20:44 bryanh Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.6 1997/08/12 20:16:04 momjian Exp $
*
* Alistair Crooks added the code for the regex caching
* agc - cached the regular expressions used - there's a good chance
@@ -166,8 +166,7 @@ fixedlen_regexeq(char *s, struct varlena* p, int charlen, int cflags)
/* be sure sterm is null-terminated */
sterm = (char *) palloc(charlen + 1);
memset(sterm, 0, charlen + 1);
strncpy(sterm, s, charlen);
strNcpy(sterm, s, charlen);
result = RE_compile_and_execute(p, sterm, cflags);

6
src/backend/utils/adt/regproc.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.4 1997/04/27 19:20:16 thomas Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.5 1997/08/12 20:16:05 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -122,14 +122,14 @@ char *regprocout(RegProcedure proid)
s = (char *) heap_getattr(proctup, InvalidBuffer, 1,
RelationGetTupleDescriptor(proc), &isnull);
if (!isnull) {
strncpy(result, s, 16);
strNcpy(result, s, 16);
break;
}
elog(FATAL, "regprocout: null procedure %d", proid);
/*FALLTHROUGH*/
case 0:
memset(result, 0, 16);
result[0] = '-';
result[1] = '\0';
#ifdef EBUG
elog(DEBUG, "regprocout: no such procedure %d", proid);
#endif /* defined(EBUG) */

11
src/backend/utils/adt/varchar.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.7 1997/03/14 23:21:01 scrappy Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.8 1997/08/12 20:16:07 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -98,8 +98,7 @@ bpcharout(char *s)
} else {
len = *(int32*)s - 4;
result = (char *) palloc(len+1);
strncpy(result, s+4, len); /* these are blank-padded */
result[len] = '\0';
strNcpy(result, s+4, len); /* these are blank-padded */
}
return(result);
}
@@ -136,8 +135,7 @@ varcharin(char *s, int dummy, int typlen)
result = (char *) palloc(typlen);
*(int32*)result = typlen;
memset(result+4, 0, len);
(void) strncpy(result+4, s, len);
strncpy(result+4, s, len);
return(result);
}
@@ -155,8 +153,7 @@ varcharout(char *s)
} else {
len = *(int32*)s - 4;
result = (char *) palloc(len+1);
memset(result, 0, len+1);
strncpy(result, s+4, len);
strNcpy(result, s+4, len);
}
return(result);
}