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

Rename strNcpy to StrNCpy, and change third parameter.

Browse Source
This commit is contained in:
Bruce Momjian
1997-10-25 01:10:58 +00:00
parent 8b53f6e5b6
commit f3af1368bd
31 changed files with 87 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.11 1997/09/08 21:48:18 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.12 1997/10/25 01:10:32 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -124,7 +124,7 @@ char16out(char *s)
result[1] = '\0';
}
else
strNcpy(result, s, 16);
StrNCpy(result, s, 16);
return (result);
}
@@ -282,7 +282,7 @@ char2out(uint16 s)
{
char *result = (char *) palloc(3);
strNcpy(result, (char *) &s, 2);
StrNCpy(result, (char *) &s, 3);
return (result);
}
@@ -349,7 +349,7 @@ uint32 s;
{
char *result = (char *) palloc(5);
strNcpy(result, (char *) &s, 4);
StrNCpy(result, (char *) &s, 5);
return (result);
}
@@ -421,7 +421,7 @@ char8out(char *s)
result[1] = '\0';
}
else
strNcpy(result, s, 8);
StrNCpy(result, s, 9);
return (result);
}

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.10 1997/09/08 02:30:40 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.11 1997/10/25 01:10:36 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -59,7 +59,7 @@ filename_in(char *file)
else
{
/* Someone else's directory */
char name[16],
char name[17],
*p;
struct passwd *pw;
int len;
@@ -72,7 +72,7 @@ filename_in(char *file)
else
{
len = (p - file) - 1;
strNcpy(name, file + 1, len);
StrNCpy(name, file + 1, len+1);
}
/* printf("name: %s\n"); */
if ((pw = getpwnam(name)) == NULL)
@@ -102,7 +102,7 @@ filename_in(char *file)
else
{
len = (p - file) - 1;
strNcpy(environment, file + 1, len);
StrNCpy(environment, file + 1, len+1);
}
envirp = getenv(environment);
if (envirp)

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

@@ -48,7 +48,7 @@ fixedlen_like(char *s, struct varlena * p, int charlen)
/* be sure sterm is null-terminated */
sterm = (char *) palloc(charlen + 1);
strNcpy(sterm, s, charlen);
StrNCpy(sterm, s, charlen+1);
/*
* p is a text = varlena, not a string so we have to make a string
@@ -150,7 +150,7 @@ textnlike(struct varlena * s, struct varlena * p)
}
/* $Revision: 1.9 $
/* $Revision: 1.10 $
** "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.

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

@@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.9 1997/09/08 21:48:33 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.10 1997/10/25 01:10:40 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -41,7 +41,7 @@ namein(char *s)
return (NULL);
result = (NameData *) palloc(NAMEDATALEN);
/* always keep it null-padded */
strNcpy(result->data, s, NAMEDATALEN - 1);
StrNCpy(result->data, s, NAMEDATALEN);
return (result);
}
@@ -159,7 +159,7 @@ namestrcpy(Name name, char *str)
{
if (!name || !str)
return (-1);
strNcpy(name->data, str, NAMEDATALEN - 1);
StrNCpy(name->data, str, NAMEDATALEN);
return (0);
}

4
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.8 1997/09/18 20:22:16 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/oidname.c,v 1.9 1997/10/25 01:10:41 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -37,7 +37,7 @@ oidnamein(char *inStr)
oc->id = (Oid) pg_atoi(inStr, sizeof(Oid), ',');
/* copy one less to ensure null-padding */
++inptr;
strNcpy(oc->name.data, inptr, NAMEDATALEN - 1);
StrNCpy(oc->name.data, inptr, NAMEDATALEN);
}
else
elog(WARN, "Bad input data for type oidname");

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

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.10 1997/09/08 21:48:40 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.11 1997/10/25 01:10:44 momjian Exp $
*
* Alistair Crooks added the code for the regex caching
* agc - cached the regular expressions used - there's a good chance
@@ -189,7 +189,7 @@ fixedlen_regexeq(char *s, struct varlena * p, int charlen, int cflags)
/* be sure sterm is null-terminated */
sterm = (char *) palloc(charlen + 1);
strNcpy(sterm, s, charlen);
StrNCpy(sterm, s, charlen+1);
result = RE_compile_and_execute(p, sterm, cflags);

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

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.7 1997/09/08 02:30:58 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.8 1997/10/25 01:10:45 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -133,7 +133,7 @@ regprocout(RegProcedure proid)
RelationGetTupleDescriptor(proc), &isnull);
if (!isnull)
{
strNcpy(result, s, 16);
StrNCpy(result, s, 16);
break;
}
elog(FATAL, "regprocout: null procedure %d", proid);

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

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.10 1997/09/08 02:31:05 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.11 1997/10/25 01:10:50 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -106,7 +106,7 @@ bpcharout(char *s)
{
len = *(int32 *) s - 4;
result = (char *) palloc(len + 1);
strNcpy(result, s + 4, len); /* these are blank-padded */
StrNCpy(result, s + 4, len+1); /* these are blank-padded */
}
return (result);
}
@@ -145,7 +145,7 @@ varcharin(char *s, int dummy, int typlen)
result = (char *) palloc(typlen);
*(int32 *) result = typlen;
strncpy(result + 4, s, len);
strncpy(result + 4, s, len+1);
return (result);
}
@@ -166,7 +166,7 @@ varcharout(char *s)
{
len = *(int32 *) s - 4;
result = (char *) palloc(len + 1);
strNcpy(result, s + 4, len);
StrNCpy(result, s + 4, len+1);
}
return (result);
}

4
src/backend/utils/sort/psort.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.26 1997/10/15 06:36:08 vadim Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.27 1997/10/25 01:10:52 momjian Exp $
*
* NOTES
* Sorts the first relation into the second relation.
@@ -1006,7 +1006,7 @@ gettape()
* now, copy template with final null into palloc'd space
*/
strNcpy(tp->tl_name, uniqueName, MAXPGPATH-1);
StrNCpy(tp->tl_name, uniqueName, MAXPGPATH);
file = AllocateFile(tp->tl_name, "w+");