ia64/xen-unstable
changeset 1666:bbd6af62af53
bitkeeper revision 1.1041.3.4 (40e52ba8BG52Ja01pk085Hoa4GWGqQ)
Fix headers.
Fix headers.
| author | mjw@wray-m-3.hpl.hp.com |
|---|---|
| date | Fri Jul 02 09:32:24 2004 +0000 (2004-07-02) |
| parents | 2e084d76fbf4 |
| children | 172f2a1c8a79 |
| files | tools/libxutil/Makefile tools/libxutil/allocate.h tools/libxutil/debug.h tools/libxutil/file_stream.h tools/libxutil/gzip_stream.c tools/libxutil/gzip_stream.h tools/libxutil/kernel_stream.h tools/libxutil/string_stream.h tools/libxutil/sys_ctype.h tools/libxutil/sys_net.h tools/libxutil/sys_string.h |
line diff
1.1 --- a/tools/libxutil/Makefile Fri Jul 02 09:22:56 2004 +0000 1.2 +++ b/tools/libxutil/Makefile Fri Jul 02 09:32:24 2004 +0000 1.3 @@ -8,7 +8,7 @@ LIB_SRCS += allocate.c 1.4 LIB_SRCS += file_stream.c 1.5 LIB_SRCS += gzip_stream.c 1.6 LIB_SRCS += iostream.c 1.7 -LIB_SRCS += sys_net.c 1.8 +#LIB_SRCS += sys_net.c 1.9 LIB_SRCS += sys_string.c 1.10 1.11 LIB_OBJS := $(LIB_SRCS:.c=.o)
2.1 --- a/tools/libxutil/allocate.h Fri Jul 02 09:22:56 2004 +0000 2.2 +++ b/tools/libxutil/allocate.h Fri Jul 02 09:32:24 2004 +0000 2.3 @@ -16,8 +16,8 @@ 2.4 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 2.5 */ 2.6 2.7 -#ifndef _XEN_LIB_ALLOCATE_H_ 2.8 -#define _XEN_LIB_ALLOCATE_H_ 2.9 +#ifndef _XUTIL_ALLOCATE_H_ 2.10 +#define _XUTIL_ALLOCATE_H_ 2.11 2.12 /** Allocate memory for a given type, and cast. */ 2.13 #define ALLOCATE(ctype) (ctype *)allocate(sizeof(ctype)) 2.14 @@ -33,7 +33,7 @@ extern void memzero(void *p, int size); 2.15 typedef void AllocateFailedFn(int size, int type); 2.16 extern AllocateFailedFn *allocate_failed_fn; 2.17 2.18 -#endif /* _XEN_LIB_ALLOCATE_H_ */ 2.19 +#endif /* _XUTIL_ALLOCATE_H_ */ 2.20 2.21 2.22
3.1 --- a/tools/libxutil/debug.h Fri Jul 02 09:22:56 2004 +0000 3.2 +++ b/tools/libxutil/debug.h Fri Jul 02 09:32:24 2004 +0000 3.3 @@ -15,8 +15,8 @@ 3.4 * along with this library; if not, write to the Free Software 3.5 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 3.6 */ 3.7 -#ifndef _XEN_LIB_DEBUG_H_ 3.8 -#define _XEN_LIB_DEBUG_H_ 3.9 +#ifndef _XUTIL_DEBUG_H_ 3.10 +#define _XUTIL_DEBUG_H_ 3.11 3.12 #ifndef MODULE_NAME 3.13 #define MODULE_NAME "" 3.14 @@ -69,4 +69,4 @@ 3.15 */ 3.16 #define IPFMT "%u.%u.%u.%u" 3.17 3.18 -#endif /* ! _XEN_LIB_DEBUG_H_ */ 3.19 +#endif /* ! _XUTIL_DEBUG_H_ */
4.1 --- a/tools/libxutil/file_stream.h Fri Jul 02 09:22:56 2004 +0000 4.2 +++ b/tools/libxutil/file_stream.h Fri Jul 02 09:32:24 2004 +0000 4.3 @@ -16,8 +16,8 @@ 4.4 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 4.5 */ 4.6 4.7 -#ifndef _XEN_LIB_FILE_STREAM_H_ 4.8 -#define _XEN_LIB_FILE_STREAM_H_ 4.9 +#ifndef _XUTIL_FILE_STREAM_H_ 4.10 +#define _XUTIL_FILE_STREAM_H_ 4.11 4.12 #ifndef __KERNEL__ 4.13 #include "iostream.h" 4.14 @@ -32,4 +32,4 @@ extern IOStream get_stream_stdin(void); 4.15 4.16 extern int file_stream_setvbuf(IOStream *io, char *buf, int mode, size_t size); 4.17 #endif 4.18 -#endif /* !_XEN_LIB_FILE_STREAM_H_ */ 4.19 +#endif /* !_XUTIL_FILE_STREAM_H_ */
5.1 --- a/tools/libxutil/gzip_stream.c Fri Jul 02 09:22:56 2004 +0000 5.2 +++ b/tools/libxutil/gzip_stream.c Fri Jul 02 09:32:24 2004 +0000 5.3 @@ -1,4 +1,3 @@ 5.4 -/* $Id: gzip_stream.c,v 1.4 2003/09/30 15:22:53 mjw Exp $ */ 5.5 /* 5.6 * Copyright (C) 2003 Hewlett-Packard Company. 5.7 *
6.1 --- a/tools/libxutil/gzip_stream.h Fri Jul 02 09:22:56 2004 +0000 6.2 +++ b/tools/libxutil/gzip_stream.h Fri Jul 02 09:32:24 2004 +0000 6.3 @@ -1,4 +1,3 @@ 6.4 -#/* $Id: gzip_stream.h,v 1.3 2003/09/30 15:22:53 mjw Exp $ */ 6.5 /* 6.6 * Copyright (C) 2003 Hewlett-Packard Company. 6.7 * 6.8 @@ -17,8 +16,8 @@ 6.9 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 6.10 */ 6.11 6.12 -#ifndef _SP_GZIP_STREAM_H_ 6.13 -#define _SP_GZIP_STREAM_H_ 6.14 +#ifndef _XUTIL_GZIP_STREAM_H_ 6.15 +#define _XUTIL_GZIP_STREAM_H_ 6.16 6.17 #ifndef __KERNEL__ 6.18 #include "iostream.h" 6.19 @@ -28,4 +27,4 @@ extern IOStream *gzip_stream_new(gzFile 6.20 extern IOStream *gzip_stream_fopen(const char *file, const char *flags); 6.21 extern IOStream *gzip_stream_fdopen(int fd, const char *flags); 6.22 #endif 6.23 -#endif /* !_SP_FILE_STREAM_H_ */ 6.24 +#endif /* !_XUTIL_GZIP_STREAM_H_ */
7.1 --- a/tools/libxutil/kernel_stream.h Fri Jul 02 09:22:56 2004 +0000 7.2 +++ b/tools/libxutil/kernel_stream.h Fri Jul 02 09:32:24 2004 +0000 7.3 @@ -16,8 +16,8 @@ 7.4 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 7.5 */ 7.6 7.7 -#ifndef _XEN_LIB_KERNEL_STREAM_H_ 7.8 -#define _XEN_LIB_KERNEL_STREAM_H_ 7.9 +#ifndef _XUTIL_KERNEL_STREAM_H_ 7.10 +#define _XUTIL_KERNEL_STREAM_H_ 7.11 7.12 #ifdef __KERNEL__ 7.13 #include "iostream.h" 7.14 @@ -26,4 +26,4 @@ extern IOStream get_stream_kernel(void); 7.15 #define get_stream_stdout get_stream_kernel 7.16 7.17 #endif /* __KERNEL__ */ 7.18 -#endif /* !_XEN_LIB_KERNEL_STREAM_H_ */ 7.19 +#endif /* !_XUTIL_KERNEL_STREAM_H_ */
8.1 --- a/tools/libxutil/string_stream.h Fri Jul 02 09:22:56 2004 +0000 8.2 +++ b/tools/libxutil/string_stream.h Fri Jul 02 09:32:24 2004 +0000 8.3 @@ -1,4 +1,3 @@ 8.4 -/* $Id: string_stream.h,v 1.1 2003/08/22 14:25:48 mjw Exp $ */ 8.5 /* 8.6 * Copyright (C) 2001, 2002 Hewlett-Packard Company. 8.7 * 8.8 @@ -17,8 +16,8 @@ 8.9 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 8.10 */ 8.11 8.12 -#ifndef _SP_STRING_STREAM_H_ 8.13 -#define _SP_STRING_STREAM_H_ 8.14 +#ifndef _XUTIL_STRING_STREAM_H_ 8.15 +#define _XUTIL_STRING_STREAM_H_ 8.16 8.17 #include "iostream.h" 8.18 8.19 @@ -43,4 +42,4 @@ extern IOMethods *string_stream_get_meth 8.20 extern IOStream *string_stream_new(char *s, int n); 8.21 extern void string_stream_init(IOStream *stream, StringData *data, char *s, int n); 8.22 8.23 -#endif /* !_SP_STRING_STREAM_H_ */ 8.24 +#endif /* !_XUTIL_STRING_STREAM_H_ */
9.1 --- a/tools/libxutil/sys_ctype.h Fri Jul 02 09:22:56 2004 +0000 9.2 +++ b/tools/libxutil/sys_ctype.h Fri Jul 02 09:32:24 2004 +0000 9.3 @@ -1,5 +1,5 @@ 9.4 -#ifndef _XENO_SYS_CTYPE_H_ 9.5 -#define _XENO_SYS_CTYPE_H_ 9.6 +#ifndef _XUTIL_SYS_CTYPE_H_ 9.7 +#define _XUTIL_SYS_CTYPE_H_ 9.8 /** @file 9.9 ** Replacement for ctype include that can be used 9.10 * from user or kernel code. 9.11 @@ -9,4 +9,4 @@ 9.12 #else 9.13 # include <ctype.h> 9.14 #endif 9.15 -#endif /* ! _XENO_SYS_CTYPE_H_ */ 9.16 +#endif /* ! _XUTIL_SYS_CTYPE_H_ */
10.1 --- a/tools/libxutil/sys_net.h Fri Jul 02 09:22:56 2004 +0000 10.2 +++ b/tools/libxutil/sys_net.h Fri Jul 02 09:32:24 2004 +0000 10.3 @@ -16,8 +16,8 @@ 10.4 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 10.5 */ 10.6 10.7 -#ifndef _XEN_LIB_SYS_NET_H_ 10.8 -#define _XEN_LIB_SYS_NET_H_ 10.9 +#ifndef _XUTIL_SYS_NET_H_ 10.10 +#define _XUTIL_SYS_NET_H_ 10.11 /** @file 10.12 * 10.13 * Replacement for standard network includes. 10.14 @@ -72,7 +72,7 @@ extern int inet_aton(const char *address 10.15 extern char *mac_ntoa(const unsigned char *macaddr); 10.16 extern int mac_aton(const char *addr, unsigned char *macaddr); 10.17 10.18 -#endif /* !_SP_SYS_NET_H_ */ 10.19 +#endif /* !_XUTIL_SYS_NET_H_ */ 10.20 10.21 10.22
11.1 --- a/tools/libxutil/sys_string.h Fri Jul 02 09:22:56 2004 +0000 11.2 +++ b/tools/libxutil/sys_string.h Fri Jul 02 09:32:24 2004 +0000 11.3 @@ -16,8 +16,8 @@ 11.4 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 11.5 */ 11.6 11.7 -#ifndef _XEN_LIB_SYS_STRING_H_ 11.8 -#define _XEN_LIB_SYS_STRING_H_ 11.9 +#ifndef _XUTIL_SYS_STRING_H_ 11.10 +#define _XUTIL_SYS_STRING_H_ 11.11 /** @file 11.12 * Replacement for standard string includes. 11.13 * Works in user or kernel code. 11.14 @@ -88,4 +88,4 @@ static inline size_t strnlen(const char 11.15 extern int convert_atoul(const char *s, unsigned long *v); 11.16 extern int path_concat(char *s, char *t, char **val); 11.17 11.18 -#endif /* !_XEN_LIB_SYS_STRING_H_ */ 11.19 +#endif /* !_XUTIL_SYS_STRING_H_ */