diff options
| author | Mark Eichin <eichin@mit.edu> | 1994-06-15 23:29:09 +0000 |
|---|---|---|
| committer | Mark Eichin <eichin@mit.edu> | 1994-06-15 23:29:09 +0000 |
| commit | af3d24d52ff3bcf060ebdb9b7565dd32f785c8e6 (patch) | |
| tree | ea50114f89d4e6c98d3b2ffd836698d9b4881f2b /src/isode/pepsy | |
| parent | 36c3380f3473e3f62a80e6b15a14ccc1d53b1675 (diff) | |
| download | krb5-af3d24d52ff3bcf060ebdb9b7565dd32f785c8e6.tar.gz krb5-af3d24d52ff3bcf060ebdb9b7565dd32f785c8e6.tar.xz krb5-af3d24d52ff3bcf060ebdb9b7565dd32f785c8e6.zip | |
step 3: bcopy->memcpy or memmove (chose by hand), twiddle args
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3818 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/isode/pepsy')
| -rw-r--r-- | src/isode/pepsy/dec.c | 7 | ||||
| -rw-r--r-- | src/isode/pepsy/main.c | 31 | ||||
| -rw-r--r-- | src/isode/pepsy/pepsy_misc.c | 13 |
3 files changed, 20 insertions, 31 deletions
diff --git a/src/isode/pepsy/dec.c b/src/isode/pepsy/dec.c index 85845ce7a..4f4a416d4 100644 --- a/src/isode/pepsy/dec.c +++ b/src/isode/pepsy/dec.c @@ -9,6 +9,9 @@ static char *rcsid = "$Header$"; * * * $Log$ + * Revision 1.2 1994/06/15 23:28:59 eichin + * step 3: bcopy->memcpy or memmove (chose by hand), twiddle args + * * Revision 1.1 1994/06/10 03:30:23 eichin * autoconfed isode for kerberos work * @@ -2064,7 +2067,7 @@ again: return pepsylose (mod, typ, NULLPE, "setdval:missing OCTET_LEN"); i = IVAL(mod, dflt); p = smalloc((int )i + 1); - bcopy(PVAL(mod, dflt), p, (int )i); + memcpy(p, PVAL(mod, dflt), (int )i); p[i] = '\0'; *(char **) (*parm + typ->pe_ucode) = p; *(int *) (*parm + (typ + 1)->pe_ucode) = i; @@ -2076,7 +2079,7 @@ again: i = IVAL(mod, dflt); no = (i + 7)/8; /* round up */ p = smalloc(no + 1); - bcopy(PVAL(mod, dflt), p, no); + memcpy(p, PVAL(mod, dflt), no); p[no] = '\0'; *(char **) (*parm + typ->pe_ucode) = p; *(int *) (*parm + (typ + 1)->pe_ucode) = i; diff --git a/src/isode/pepsy/main.c b/src/isode/pepsy/main.c index 9c5288c96..bf0af1f61 100644 --- a/src/isode/pepsy/main.c +++ b/src/isode/pepsy/main.c @@ -7,23 +7,6 @@ static char *rcsid = "$Header$"; /* * $Header$ * - * - * $Log$ - * Revision 1.2 1994/06/15 21:14:59 eichin - * step 2: bcmp->memcmp - * - * Revision 1.1 1994/06/10 03:30:46 eichin - * autoconfed isode for kerberos work - * - * Revision 1.1 94/06/10 03:19:12 eichin - * autoconfed isode for kerberos work - * - * Revision 1.1 1994/05/31 20:39:33 eichin - * reduced-isode release from /mit/isode/isode-subset/src - * - * Revision 8.0 91/07/17 12:42:59 isode - * Release 7.0 - * * */ @@ -882,11 +865,11 @@ int tynum; Xparm->t_string = strdup("hello, world\n"); Xparm->t_string1 = strdup("hello, world\n"); p = malloc(30); - bcopy("\0001234567890", p, 30); + memcpy(p, "\0001234567890", 30); Xparm->t_ostring = p; Xparm->t_olen = t_test + 4; p = malloc(30); - bcopy("\0001234567890", p, 30); + memcpy(p, "\0001234567890", 30); Xparm->t_ostring1 = p; Xparm->t_olen1 = t_test + 4; Xparm->t_bool = t_test % 2; @@ -900,7 +883,7 @@ int tynum; Xparm->t_pe1 = strb2bitstr("\0221\0327\052\211\0237\200", 41, 0, 0); Xparm->t_any = mkpe(t_test*8 + 3); p = malloc(30); - bcopy("\0001234567890", p, 30); + memcpy(p, "\0001234567890", 30); Xparm->t_bstring = p; Xparm->t_blen = t_test*8 + 8; break; @@ -913,11 +896,11 @@ int tynum; Xparm->t_qbuf = str2qb("Some is out there!", 18, 1); Xparm->t_string = strdup("hello, world\n"); p = malloc(30); - bcopy("\0001234567890", p, 30); + memcpy(p, "\0001234567890", 30); Xparm->t_ostring = p; Xparm->t_olen = t_test + 4; p = malloc(30); - bcopy("\0001234567890", p, 30); + memcpy(p, "\0001234567890", 30); Xparm->t_bstring = p; Xparm->t_blen = t_test*8 + 4; Xparm->t_bool = t_test % 2; @@ -993,11 +976,11 @@ int tynum; Xparm->t_qbuf = str2qb("Some one is out there!", 22, 1); Xparm->t_string = strdup("hello there, world\n"); p = malloc(30); - bcopy("\0001234567890", p, 30); + memcpy(p, "\0001234567890", 30); Xparm->t_ostring = p; Xparm->t_olen = t_test + 4; p = malloc(30); - bcopy("\0001234567890", p, 30); + memcpy(p, "\0001234567890", 30); Xparm->t_bstring = p; Xparm->t_blen = t_test*8 + 4; Xparm->t_pe = strb2bitstr("\0221\0327\052\211\0237\200", t_test + 33, 0, 0); diff --git a/src/isode/pepsy/pepsy_misc.c b/src/isode/pepsy/pepsy_misc.c index 98edbdc61..e9fd5b6e5 100644 --- a/src/isode/pepsy/pepsy_misc.c +++ b/src/isode/pepsy/pepsy_misc.c @@ -9,6 +9,9 @@ static char *rcsid = "$Header$"; * * * $Log$ + * Revision 1.2 1994/06/15 23:29:09 eichin + * step 3: bcopy->memcpy or memmove (chose by hand), twiddle args + * * Revision 1.1 1994/06/10 03:31:22 eichin * autoconfed isode for kerberos work * @@ -77,11 +80,11 @@ OID o1, o2; if (noid -> oid_elements == NULL) myyerror ("out of memory (%d needed)", noid->oid_nelem); - bcopy ((char *)o1->oid_elements, (char *)noid->oid_elements, - o1->oid_nelem * sizeof(unsigned int)); - bcopy ((char *)o2 -> oid_elements, - (char *) &noid -> oid_elements[o1->oid_nelem], - o2 -> oid_nelem * sizeof(unsigned int)); + memcpy ((char *)noid->oid_elements, (char *)o1->oid_elements, + o1->oid_nelem * sizeof(unsigned int)); + memcpy ((char *) &noid -> oid_elements[o1->oid_nelem], + (char *)o2 -> oid_elements, + o2 -> oid_nelem * sizeof(unsigned int)); return noid; } |
