NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x11r7/libFS susv3-legacy: update to what got applied upstream

Browse Source 
For details, see:
http://lists.freedesktop.org/archives/xorg/2008-October/039630.html
This commit is contained in:
Peter Korsgaard 2008-10-22 14:39:46 +00:00
parent ec65ef836f
commit 9364487c25
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
package/x11r7/xlib_libFS/xlib_libFS-susv3-legacy.patch
View File

@ -1,4 +1,10 @@
libFS: use memcpy instead of bcopy From: Peter Korsgaard <jacmet@sunsite.dk>
Subject: [PATCH] libFS: use memmove instead of bcopy
bcopy is marked as legacy in SuSv3 and not available in the default
configuration of uClibc. Replace with memmove proposed by SuSv3.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
--- ---
src/FSOpenServ.c | 2 +- src/FSOpenServ.c | 2 +-
src/FSlibInt.c | 2 +- src/FSlibInt.c | 2 +-
@ -15,7 +21,7 @@ Index: libFS-1.0.0/src/FSOpenServ.c
return (FSServer *) 0; return (FSServer *) 0;
} }
- bcopy(ad, alts[i].name, altlen); - bcopy(ad, alts[i].name, altlen);
+ memcpy(alts[i].name, ad, altlen); + memmove(alts[i].name, ad, altlen);
alts[i].name[altlen] = '\0'; alts[i].name[altlen] = '\0';
ad += altlen + ((4 - (altlen + 2)) & 3); ad += altlen + ((4 - (altlen + 2)) & 3);
} }
@ -28,7 +34,7 @@ Index: libFS-1.0.0/src/FSlibInt.c
{ {
if (svr->bufptr + (len) <= svr->bufmax) { if (svr->bufptr + (len) <= svr->bufmax) {
- bcopy(data, svr->bufptr, (int) len); - bcopy(data, svr->bufptr, (int) len);
+ memcpy(svr->bufptr, data, (int) len); + memmove(svr->bufptr, data, (int) len);
svr->bufptr += ((len) + 3) & ~3; svr->bufptr += ((len) + 3) & ~3;
} else { } else {
_FSSend(svr, data, len); _FSSend(svr, data, len);
@ -41,7 +47,7 @@ Index: libFS-1.0.0/src/FSlibint.h
#define Data(svr, data, len) \ #define Data(svr, data, len) \
if (svr->bufptr + (len) <= svr->bufmax) {\ if (svr->bufptr + (len) <= svr->bufmax) {\
- bcopy(data, svr->bufptr, (int)len);\ - bcopy(data, svr->bufptr, (int)len);\
+ memcpy(svr->bufptr, data, (int)len); \ + memmove(svr->bufptr, data, (int)len); \
svr->bufptr += ((len) + 3) & ~3;\ svr->bufptr += ((len) + 3) & ~3;\
} else\ } else\
_FSSend(svr, data, len) _FSSend(svr, data, len)
@ -50,7 +56,7 @@ Index: libFS-1.0.0/src/FSlibint.h
{ register char *cpvar; \ { register char *cpvar; \
for (cpvar = (char *) start; endcond; cpvar = NEXTPTR(cpvar,type), decr) { \ for (cpvar = (char *) start; endcond; cpvar = NEXTPTR(cpvar,type), decr) { \
- type dummy; bcopy (cpvar, (char *) &dummy, SIZEOF(type)); \ - type dummy; bcopy (cpvar, (char *) &dummy, SIZEOF(type)); \
+ type dummy; memcpy ((char *) &dummy, cpvar, SIZEOF(type)); \ + type dummy; memmove ((char *) &dummy, cpvar, SIZEOF(type)); \
tpvar = (type *) cpvar; tpvar = (type *) cpvar;
#define ENDITERATE }} #define ENDITERATE }}
@ -63,7 +69,7 @@ Index: libFS-1.0.0/src/FSlibos.h
#if (MSKCNT>4) #if (MSKCNT>4)
-#define COPYBITS(src, dst) bcopy((caddr_t) src, (caddr_t) dst, sizeof(FdSet)) -#define COPYBITS(src, dst) bcopy((caddr_t) src, (caddr_t) dst, sizeof(FdSet))
+#define COPYBITS(src, dst) memcpy((caddr_t) dst, (caddr_t) src, sizeof(FdSet)) +#define COPYBITS(src, dst) memmove((caddr_t) dst, (caddr_t) src, sizeof(FdSet))
#define CLEARBITS(buf) bzero((caddr_t) buf, sizeof(FdSet)) #define CLEARBITS(buf) bzero((caddr_t) buf, sizeof(FdSet))
#define MASKANDSETBITS(dst, b1, b2) \ #define MASKANDSETBITS(dst, b1, b2) \
{ int cri; \ { int cri; \