Page MenuHomeFreeBSD
Files F156393589

D32235.diff
No OneTemporary
Actions

D32235.diff
View Options

diff --git a/libexec/bootpd/bootpd.c b/libexec/bootpd/bootpd.c
--- a/libexec/bootpd/bootpd.c
+++ b/libexec/bootpd/bootpd.c
@@ -73,14 +73,6 @@
# include <fcntl.h> /* for O_RDONLY, etc */
#endif
-#ifndef USE_BFUNCS
-# include <memory.h>
-/* Yes, memcpy is OK here (no overlapped copies). */
-# define bcopy(a,b,c) memcpy(b,a,c)
-# define bzero(p,l) memset(p,0,l)
-# define bcmp(a,b,c) memcmp(a,b,c)
-#endif
-
#include "bootp.h"
#include "hash.h"
#include "hwaddr.h"
diff --git a/libexec/bootpd/bootpgw/bootpgw.c b/libexec/bootpd/bootpgw/bootpgw.c
--- a/libexec/bootpd/bootpgw/bootpgw.c
+++ b/libexec/bootpd/bootpgw/bootpgw.c
@@ -66,14 +66,6 @@
# include <fcntl.h> /* for O_RDONLY, etc */
#endif
-#ifndef USE_BFUNCS
-# include <memory.h>
-/* Yes, memcpy is OK here (no overlapped copies). */
-# define bcopy(a,b,c) memcpy(b,a,c)
-# define bzero(p,l) memset(p,0,l)
-# define bcmp(a,b,c) memcmp(a,b,c)
-#endif
-
#include "bootp.h"
#include "getif.h"
#include "hwaddr.h"
diff --git a/libexec/bootpd/dovend.c b/libexec/bootpd/dovend.c
--- a/libexec/bootpd/dovend.c
+++ b/libexec/bootpd/dovend.c
@@ -15,15 +15,6 @@
#include <errno.h>
#include <syslog.h>
-#ifndef USE_BFUNCS
-# include <memory.h>
-/* Yes, memcpy is OK here (no overlapped copies). */
-# define bcopy(a,b,c) memcpy(b,a,c)
-# define bzero(p,l) memset(p,0,l)
-# define bcmp(a,b,c) memcmp(a,b,c)
-# define index strchr
-#endif
-
#include "bootp.h"
#include "bootpd.h"
#include "report.h"
diff --git a/libexec/bootpd/dumptab.c b/libexec/bootpd/dumptab.c
--- a/libexec/bootpd/dumptab.c
+++ b/libexec/bootpd/dumptab.c
@@ -10,17 +10,10 @@
#include <stdio.h>
#include <stdlib.h>
+#include <strings.h>
#include <syslog.h>
#include <time.h>
-#ifndef USE_BFUNCS
-#include <memory.h>
-/* Yes, memcpy is OK here (no overlapped copies). */
-#define bcopy(a,b,c) memcpy(b,a,c)
-#define bzero(p,l) memset(p,0,l)
-#define bcmp(a,b,c) memcmp(a,b,c)
-#endif
-
#include "bootp.h"
#include "hash.h"
#include "hwaddr.h"
diff --git a/libexec/bootpd/hash.c b/libexec/bootpd/hash.c
--- a/libexec/bootpd/hash.c
+++ b/libexec/bootpd/hash.c
@@ -37,14 +37,7 @@
#include <sys/types.h>
#include <stdlib.h>
-
-#ifndef USE_BFUNCS
-#include <memory.h>
-/* Yes, memcpy is OK here (no overlapped copies). */
-#define bcopy(a,b,c) memcpy(b,a,c)
-#define bzero(p,l) memset(p,0,l)
-#define bcmp(a,b,c) memcmp(a,b,c)
-#endif
+#include <strings.h>
#include "hash.h"
diff --git a/libexec/bootpd/hwaddr.c b/libexec/bootpd/hwaddr.c
--- a/libexec/bootpd/hwaddr.c
+++ b/libexec/bootpd/hwaddr.c
@@ -38,14 +38,6 @@
#endif
#include <syslog.h>
-#ifndef USE_BFUNCS
-/* Yes, memcpy is OK here (no overlapped copies). */
-#include <memory.h>
-#define bcopy(a,b,c) memcpy(b,a,c)
-#define bzero(p,l) memset(p,0,l)
-#define bcmp(a,b,c) memcmp(a,b,c)
-#endif
-
#ifndef ATF_INUSE /* Not defined on some systems (i.e. Linux) */
#define ATF_INUSE 0
#endif
diff --git a/libexec/bootpd/lookup.c b/libexec/bootpd/lookup.c
--- a/libexec/bootpd/lookup.c
+++ b/libexec/bootpd/lookup.c
@@ -17,14 +17,9 @@
#endif
#include <netdb.h>
+#include <strings.h>
#include <syslog.h>
-#ifndef USE_BFUNCS
-#include <memory.h>
-/* Yes, memcpy is OK here (no overlapped copies). */
-#define bcopy(a,b,c) memcpy(b,a,c)
-#endif
-
#include "bootp.h"
#include "lookup.h"
#include "report.h"
diff --git a/libexec/bootpd/readfile.c b/libexec/bootpd/readfile.c
--- a/libexec/bootpd/readfile.c
+++ b/libexec/bootpd/readfile.c
@@ -46,14 +46,6 @@
#include <assert.h>
#include <syslog.h>
-#ifndef USE_BFUNCS
-#include <memory.h>
-/* Yes, memcpy is OK here (no overlapped copies). */
-#define bcopy(a,b,c) memcpy(b,a,c)
-#define bzero(p,l) memset(p,0,l)
-#define bcmp(a,b,c) memcmp(a,b,c)
-#endif
-
#include "bootp.h"
#include "hash.h"
#include "hwaddr.h"
diff --git a/libexec/bootpd/tools/bootpef/bootpef.c b/libexec/bootpd/tools/bootpef/bootpef.c
--- a/libexec/bootpd/tools/bootpef/bootpef.c
+++ b/libexec/bootpd/tools/bootpef/bootpef.c
@@ -55,14 +55,6 @@
#include <ctype.h>
#include <syslog.h>
-#ifndef USE_BFUNCS
-#include <memory.h>
-/* Yes, memcpy is OK here (no overlapped copies). */
-#define bcopy(a,b,c) memcpy(b,a,c)
-#define bzero(p,l) memset(p,0,l)
-#define bcmp(a,b,c) memcmp(a,b,c)
-#endif
-
#include "bootp.h"
#include "hash.h"
#include "hwaddr.h"
diff --git a/libexec/bootpd/tools/bootptest/bootptest.h b/libexec/bootpd/tools/bootptest/bootptest.h
--- a/libexec/bootpd/tools/bootptest/bootptest.h
+++ b/libexec/bootpd/tools/bootptest/bootptest.h
@@ -6,14 +6,6 @@
#define ESRC(p) (p)
#define EDST(p) (p)
-#ifndef USE_BFUNCS
-/* Use mem/str functions */
-/* There are no overlapped copies, so memcpy is OK. */
-#define bcopy(a,b,c) memcpy(b,a,c)
-#define bzero(p,l) memset(p,0,l)
-#define bcmp(a,b,c) memcmp(a,b,c)
-#endif
-
extern int vflag; /* verbose flag */
/* global pointers to beginning and end of current packet (during printing) */

File Metadata

Mime Type
text/plain
Expires
Thu, May 14, 8:00 AM (3 h, 44 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33034225
Default Alt Text
D32235.diff (4 KB)

Event Timeline