Hello community,
here is the log from the commit of package libHX
checked in at Fri Sep 5 22:04:32 CEST 2008.
--------
--- libHX/libHX.changes 2008-08-14 17:58:45.000000000 +0200
+++ libHX/libHX.changes 2008-09-05 11:04:23.650788000 +0200
@@ -1,0 +2,8 @@
+Fri Sep 5 09:56:48 CEST 2008 - mc@suse.de
+
+- update to version 1.23
+ - code cleanup: misc.h has been split off libHX.h
+ - add defs.h
+- move libs to /lib[64] (required for pam_mount)
+
+-------------------------------------------------------------------
Old:
----
libHX-1.22.tar.bz2
New:
----
libHX-1.23.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libHX.spec ++++++
--- /var/tmp/diff_new_pack.I22887/_old 2008-09-05 22:04:15.000000000 +0200
+++ /var/tmp/diff_new_pack.I22887/_new 2008-09-05 22:04:15.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package libHX (Version 1.22)
+# spec file for package libHX (Version 1.23)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -22,7 +22,7 @@
%define lname libHX13
BuildRequires: gcc-c++ libxml2-devel
Summary: General-purpose Library
-Version: 1.22
+Version: 1.23
Release: 1
License: LGPL v2.1 or later; LGPL v3 or later
Prefix: /usr
@@ -131,7 +131,7 @@
%build
./autogen.sh;
-%configure
+%configure --libdir=/%_lib --with-pkgconfigdir=/%_libdir/pkgconfig/
make %{?jobs:-j%jobs};
perl -i -pe 's/^shouldnotlink=yes/shouldnotlink=no/;' \
src/%{name}.la src/.libs/%{name}.lai;
@@ -140,7 +140,7 @@
make install DESTDIR=${RPM_BUILD_ROOT}
mkdir -p "${RPM_BUILD_ROOT}/%_docdir";
cp -a doc "${RPM_BUILD_ROOT}/%_docdir/%name";
-rm -f ${RPM_BUILD_ROOT}/%_libdir/%{name}.la
+rm -f ${RPM_BUILD_ROOT}/%_lib/%{name}.la
%clean
rm -rf $RPM_BUILD_ROOT
@@ -151,17 +151,22 @@
%files -n %{lname}
%defattr(-, root, root)
-%_libdir/%{name}*.so.*
+/%_lib/%{name}*.so.*
%files devel
%defattr(-, root, root)
%docdir %_docdir/%name
%_docdir/%name
%_includedir/%{name}*
-%_libdir/%{name}*.so
+/%_lib/%{name}*.so
%_libdir/pkgconfig/*.pc
%changelog
+* Fri Sep 05 2008 mc@suse.de
+- update to version 1.23
+ - code cleanup: misc.h has been split off libHX.h
+ - add defs.h
+- move libs to /lib[64] (required for pam_mount)
* Thu Aug 14 2008 mc@suse.de
- update to version 1.22
* need to use lstat() on directory operations such as mkdir and rmdir
++++++ libHX-1.22.tar.bz2 -> libHX-1.23.tar.bz2 ++++++
++++ 4329 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/configure.ac new/libHX-1.23/configure.ac
--- old/libHX-1.22/configure.ac 2008-07-16 21:08:33.000000000 +0200
+++ new/libHX-1.23/configure.ac 2008-09-03 00:44:01.000000000 +0200
@@ -1,5 +1,5 @@
-AC_INIT([libHX], [1.22])
+AC_INIT([libHX], [1.23])
AC_CONFIG_HEADERS([libHX/config.h])
AC_PROG_INSTALL
AM_INIT_AUTOMAKE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/dist/suse/libHX.spec new/libHX-1.23/dist/suse/libHX.spec
--- old/libHX-1.22/dist/suse/libHX.spec 2008-07-16 21:08:33.000000000 +0200
+++ new/libHX-1.23/dist/suse/libHX.spec 2008-09-03 00:44:01.000000000 +0200
@@ -1,7 +1,7 @@
Name: libHX13
%define lname libHX
-Version: 1.22
+Version: 1.23
Release: 0
Group: System/Libraries
URL: http://jengelh.medozas.de/projects/libHX/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/doc/changelog.txt new/libHX-1.23/doc/changelog.txt
--- old/libHX-1.22/doc/changelog.txt 2008-07-16 21:08:33.000000000 +0200
+++ new/libHX-1.23/doc/changelog.txt 2008-09-03 00:44:01.000000000 +0200
@@ -1,4 +1,9 @@
+libHX 1.23 (September 02 2008)
+==============================
+- code cleanup: misc.h has been split off libHX.h
+- add defs.h
+
libHX 1.22 (July 16 2008)
=========================
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/libHX.h new/libHX-1.23/libHX.h
--- old/libHX-1.22/libHX.h 2008-07-16 21:08:33.000000000 +0200
+++ new/libHX-1.23/libHX.h 2008-09-03 00:44:01.000000000 +0200
@@ -1,126 +1,10 @@
-/*
- * libHX/libHX.h
- * Copyright © Jan Engelhardt , 1999 - 2008
- *
- * This file is part of libHX. libHX is free software; you can
- * redistribute it and/or modify it under the terms of the GNU
- * Lesser General Public License as published by the Free Software
- * Foundation; either version 2 or 3 of the License.
- */
#ifndef _LIBHX_H
-#define _LIBHX_H 20080610
-
-#ifndef __cplusplus
-# include
-# include
-# include
-# include
-#else
-# include <cstdarg>
-# include <cstdio>
-# include <cstdlib>
-# include <cstring>
-#endif
-#if defined _WIN32
-# include
-#else
-# include
-# include
-# include
-#endif
-#ifdef LIBHX_INTERNAL /* only for compiling libHX */
-# include "libHX/internal.h"
-#endif
+#define _LIBHX_H 20080902
#include
#include
+#include
#include
#include
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * DIR.C
- */
-enum {
- HXF_UID = 1 << 0,
- HXF_GID = 1 << 1,
- HXF_KEEP = 1 << 2,
-};
-
-extern void *HXdir_open(const char *);
-extern const char *HXdir_read(void *);
-extern void HXdir_close(void *);
-extern int HX_copy_dir(const char *, const char *, unsigned int, ...);
-extern int HX_copy_file(const char *, const char *, unsigned int, ...);
-extern int HX_mkdir(const char *);
-extern int HX_rrmdir(const char *);
-
-/*
- * DL.C
- */
-extern void *HX_dlopen(const char *);
-extern void *HX_dlsym(void *, const char *);
-extern void HX_dlclose(void *);
-extern const char *HX_dlerror(void);
-
-/*
- * OTHER.C
- */
-enum {
- HX_FSYSTEM_ARGV = 1 << 0,
- HX_FSYSTEM_EXEC = 1 << 1,
- HX_FSYSTEM_ARGV1 = 1 << 2,
-};
-
-extern int HX_ffs(unsigned long);
-extern void HX_zvecfree(char **);
-extern int HX_fsystem(unsigned int, const char *, const char *, ...);
-extern int HX_vfsystem(unsigned int, const char *, const char *, va_list);
-
-/*
- * RAND.C
- */
-extern int HX_rand(void);
-extern unsigned int HX_irand(unsigned int, unsigned int);
-
-#ifdef _WIN32
-# define MAP_FAILED ((void *)-1)
-# define PROT_NONE 0x0
-# define PROT_READ 0x1
-# define PROT_WRITE 0x2
-# define PROT_EXEC 0x4
-# define MAP_SHARED 0x1
-# define MAP_PRIVATE 0x2
-extern void *mmap(void *, size_t, int, int, int, off_t);
-extern int munmap(void *, size_t);
-#endif
-
-/*
- * INLINE FUNCTIONS
- */
-static inline int HX_zveclen(const char **args)
-{
- int argk = 0;
- while (*args++ != NULL)
- ++argk;
- return argk;
-}
-
-#ifdef __cplusplus
-} /* extern "C" */
-
-extern "C++" {
-
-template<typename type> static inline type
-HX_dlsym(void *handle, const char *symbol)
-{
- return reinterpret_cast<type>(HX_dlsym(handle, symbol));
-}
-
-} /* extern "C++" */
-#endif
-
#endif /* _LIBHX_H */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/Makefile.am new/libHX-1.23/Makefile.am
--- old/libHX-1.22/Makefile.am 2008-07-16 21:08:33.000000000 +0200
+++ new/libHX-1.23/Makefile.am 2008-09-03 00:44:01.000000000 +0200
@@ -6,8 +6,8 @@
pkgconfigdir = @pkgconfigdir@
pkgconfig_DATA = libHX.pc
-nobase_include_HEADERS = libHX.h libHX/arbtree.h libHX/clist.h \
- libHX/deque.h libHX/list.h libHX/option.h libHX/string.h \
+nobase_include_HEADERS = libHX.h libHX/arbtree.h libHX/clist.h libHX/defs.h \
+ libHX/deque.h libHX/list.h libHX/misc.h libHX/option.h libHX/string.h \
libHX/libxml_helper.h
$(pkgconfig_DATA): config.status
@@ -15,7 +15,7 @@
.PHONY: tarball
tarball:
rm -Rf /tmp/${PACKAGE_NAME}-${PACKAGE_VERSION};
- pushd ${top_srcdir} && git-archive --prefix=${PACKAGE_NAME}-${PACKAGE_VERSION}/ HEAD | tar -C /tmp -x && popd;
+ pushd ${top_srcdir} && git archive --prefix=${PACKAGE_NAME}-${PACKAGE_VERSION}/ HEAD | tar -C /tmp -x && popd;
pushd /tmp/${PACKAGE_NAME}-${PACKAGE_VERSION} && ./autogen.sh && popd;
tar -C /tmp -cjf ${PACKAGE_NAME}-${PACKAGE_VERSION}.tar.bz2 --owner=root --group=root ${PACKAGE_NAME}-${PACKAGE_VERSION}/;
rm -Rf /tmp/${PACKAGE_NAME}-${PACKAGE_VERSION};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/src/arbtree.c new/libHX-1.23/src/arbtree.c
--- old/libHX-1.22/src/arbtree.c 2008-07-16 21:08:33.000000000 +0200
+++ new/libHX-1.23/src/arbtree.c 2008-09-03 00:44:01.000000000 +0200
@@ -13,8 +13,9 @@
#include
#include
#include
-#include
#include
+#include
+#include "internal.h"
enum {
S_LEFT = 0,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/src/defs.h new/libHX-1.23/src/defs.h
--- old/libHX-1.22/src/defs.h 1970-01-01 01:00:00.000000000 +0100
+++ new/libHX-1.23/src/defs.h 2008-09-03 00:44:01.000000000 +0200
@@ -0,0 +1,50 @@
+#ifndef _LIBHX_DEFS_H
+#define _LIBHX_DEFS_H 1
+
+#ifndef __cplusplus
+ /* These are annotations only in C mode. */
+# ifndef const_cast
+# define const_cast(type, expr) ((type)(expr))
+# endif
+# ifndef signed_cast
+ /* N.B. signed_cast<> does not exist in C++. */
+# define signed_cast(type, expr) ((type)(expr))
+# endif
+# ifndef static_cast
+# define static_cast(type, expr) ((type)(expr))
+# endif
+# ifndef reinterpret_cast
+# define reinterpret_cast(type, expr) ((type)(expr))
+# endif
+#endif
+#ifndef offsetof
+# define offsetof(type, member) \
+ reinterpret_cast(long, &(static_cast(type *, NULL)->member))
+#endif
+#ifndef containerof
+# define containerof(var, type, member) reinterpret_cast(type *, \
+ reinterpret_cast(const char *, var) - offsetof(type, member))
+#endif
+#ifndef ARRAY_SIZE
+# define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
+#endif
+#ifndef BUILD_BUG_ON
+# define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2 * !!(condition)]))
+#endif
+#ifndef O_BINARY
+# define O_BINARY 0
+#endif
+#ifndef S_IRUGO
+# define S_IRUGO (S_IRUSR | S_IRGRP | S_IROTH)
+#endif
+#ifndef S_IWUGO
+# define S_IWUGO (S_IWUSR | S_IWGRP | S_IWOTH)
+#endif
+#ifndef S_IXUGO
+# define S_IXUGO (S_IXUSR | S_IXGRP | S_IXOTH)
+#endif
+#ifndef S_IRWXUGO
+# define S_IRWXUGO (S_IRUGO | S_IWUGO | S_IXUGO)
+#endif
+
+#endif /* _LIBHX_DEFS_H */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/src/deque.c new/libHX-1.23/src/deque.c
--- old/libHX-1.22/src/deque.c 2008-07-16 21:08:33.000000000 +0200
+++ new/libHX-1.23/src/deque.c 2008-09-03 00:44:01.000000000 +0200
@@ -11,8 +11,8 @@
#include
#include
#include
-#include
#include
+#include "internal.h"
static inline void HXdeque_add(struct HXdeque_node *, struct HXdeque_node *);
static inline void HXdeque_drop(struct HXdeque *, struct HXdeque_node *);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/src/dir.c new/libHX-1.23/src/dir.c
--- old/libHX-1.22/src/dir.c 2008-07-16 21:08:33.000000000 +0200
+++ new/libHX-1.23/src/dir.c 2008-09-03 00:44:01.000000000 +0200
@@ -20,14 +20,13 @@
#if defined _WIN32
# include
# include
+#else
+# include
+# include
#endif
-#include "libHX.h"
-#ifndef S_IRUGO
-# define S_IRUGO (S_IRUSR | S_IRGRP | S_IROTH)
-#endif
-#ifndef S_IWUGO
-# define S_IWUGO (S_IWUSR | S_IWGRP | S_IWOTH)
-#endif
+#include
+#include
+#include "internal.h"
struct HXdir {
#if defined _WIN32
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/src/dl.c new/libHX-1.23/src/dl.c
--- old/libHX-1.22/src/dl.c 2008-07-16 21:08:33.000000000 +0200
+++ new/libHX-1.23/src/dl.c 2008-09-03 00:44:01.000000000 +0200
@@ -3,7 +3,8 @@
#else
# include
#endif
-#include "libHX.h"
+#include
+#include "internal.h"
EXPORT_SYMBOL void *HX_dlopen(const char *file)
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/src/format.c new/libHX-1.23/src/format.c
--- old/libHX-1.22/src/format.c 2008-07-16 21:08:33.000000000 +0200
+++ new/libHX-1.23/src/format.c 2008-09-03 00:44:01.000000000 +0200
@@ -11,7 +11,11 @@
#include
#include
#include
-#include "libHX.h"
+#include
+#include
+#include
+#include
+#include "internal.h"
/* Definitions */
#define MAX_KEY_SIZE 256
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/src/.gitignore new/libHX-1.23/src/.gitignore
--- old/libHX-1.22/src/.gitignore 2008-07-16 21:08:33.000000000 +0200
+++ new/libHX-1.23/src/.gitignore 2008-09-03 00:44:01.000000000 +0200
@@ -4,6 +4,7 @@
/t?-deque
/t?-dir
/t?-list
+/t?-misc
/t?-option
/t?-other
/t?-string
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/src/hmc.c new/libHX-1.23/src/hmc.c
--- old/libHX-1.22/src/hmc.c 2008-07-16 21:08:33.000000000 +0200
+++ new/libHX-1.23/src/hmc.c 2008-09-03 00:44:01.000000000 +0200
@@ -11,7 +11,8 @@
#include
#include
#include
-#include "libHX.h"
+#include
+#include "internal.h"
#define HMC_IDENT 0x200571AF
#define CHECK_IDENT(c) \
@@ -88,7 +89,7 @@
return *vp = ctx->data;
}
-EXPORT_SYMBOL size_t hmc_length(hmc_t *vp)
+EXPORT_SYMBOL size_t hmc_length(const hmc_t *vp)
{
struct memcont *ctx = containerof(vp, struct memcont, data);
CHECK_IDENT(ctx);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/src/internal.h new/libHX-1.23/src/internal.h
--- old/libHX-1.22/src/internal.h 2008-07-16 21:08:33.000000000 +0200
+++ new/libHX-1.23/src/internal.h 2008-09-03 00:44:01.000000000 +0200
@@ -11,6 +11,15 @@
#define LIBHX_INTERNAL_H 1
#include "libHX/config.h"
+#include "libHX/defs.h"
+
+#ifdef __cplusplus
+ /* Only for our dual C/C++ testsuites */
+# define const_cast(type, expr) const_cast<type>(expr)
+# define dynamic_cast(type, expr) dynamic_cast<type>(expr)
+# define static_cast(type, expr) static_cast<type>(expr)
+# define reinterpret_cast(type, expr) reinterpret_cast<type>(expr)
+#endif
#ifdef __MINGW32__
# include "libHX/uxcompat.h"
@@ -26,25 +35,7 @@
# define EXPORT_SYMBOL
#endif
-#ifndef O_BINARY
-# define O_BINARY 0
-#endif
#define MAXFNLEN 256 /* max length for filename buffer */
#define MAXLNLEN 1024 /* max length for usual line */
-#define const_cast(type, expr) ((type)(expr))
-#define static_cast(type, expr) ((type)(expr))
-#define reinterpret_cast(type, expr) ((type)(expr))
-
-#ifndef offsetof
-# define offsetof(type, member) \
- reinterpret_cast(long, &(static_cast(type *, NULL)->member))
-#endif
-#ifndef containerof
-# define containerof(var, type, member) reinterpret_cast(type *, \
- reinterpret_cast(const char *, var) - offsetof(type, member))
-#endif
-
-#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2 * !!(condition)]))
-
#endif /* LIBHX_INTERNAL_H */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/src/Makefile.am new/libHX-1.23/src/Makefile.am
--- old/libHX-1.22/src/Makefile.am 2008-07-16 21:08:33.000000000 +0200
+++ new/libHX-1.23/src/Makefile.am 2008-09-03 00:44:01.000000000 +0200
@@ -1,6 +1,6 @@
# -*- Makefile -*-
-AM_CFLAGS = -DLIBHX_INTERNAL ${regular_CFLAGS} ${GCC_FVISIBILITY_HIDDEN}
+AM_CFLAGS = ${regular_CFLAGS} ${GCC_FVISIBILITY_HIDDEN}
DEFAULT_INCLUDES = -I${top_srcdir} -I${top_builddir}
lib_LTLIBRARIES = libHX.la
@@ -13,6 +13,7 @@
noinst_PROGRAMS += tc-arbtree tx-arbtree
noinst_PROGRAMS += tc-deque tx-deque
noinst_PROGRAMS += tc-list tx-list
+noinst_PROGRAMS += tc-misc tx-misc
noinst_PROGRAMS += tc-option tx-option
noinst_PROGRAMS += tc-other tx-other
noinst_PROGRAMS += tc-dir tx-dir
@@ -32,6 +33,7 @@
tx_dir_LDADD = libHX.la
tx_list_SOURCES = tx-list.cpp
tx_list_LDADD = libHX.la
+tx_misc_SOURCES = tx-misc.cpp
tx_option_SOURCES = tx-option.cpp
tx_other_SOURCES = tx-other.cpp
tx_other_LDADD = libHX.la
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/src/misc.h new/libHX-1.23/src/misc.h
--- old/libHX-1.22/src/misc.h 1970-01-01 01:00:00.000000000 +0100
+++ new/libHX-1.23/src/misc.h 2008-09-03 00:44:01.000000000 +0200
@@ -0,0 +1,98 @@
+#ifndef _LIBHX_MISC_H
+#define _LIBHX_MISC_H 1
+
+#ifndef __cplusplus
+# include
+# include
+#else
+# include <cstdarg>
+# include <cstdio>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * DIR.C
+ */
+enum {
+ HXF_UID = 1 << 0,
+ HXF_GID = 1 << 1,
+ HXF_KEEP = 1 << 2,
+};
+
+extern void *HXdir_open(const char *);
+extern const char *HXdir_read(void *);
+extern void HXdir_close(void *);
+extern int HX_copy_dir(const char *, const char *, unsigned int, ...);
+extern int HX_copy_file(const char *, const char *, unsigned int, ...);
+extern int HX_mkdir(const char *);
+extern int HX_rrmdir(const char *);
+
+/*
+ * DL.C
+ */
+extern void *HX_dlopen(const char *);
+extern void *HX_dlsym(void *, const char *);
+extern void HX_dlclose(void *);
+extern const char *HX_dlerror(void);
+
+/*
+ * OTHER.C
+ */
+enum {
+ HX_FSYSTEM_ARGV = 1 << 0,
+ HX_FSYSTEM_EXEC = 1 << 1,
+ HX_FSYSTEM_ARGV1 = 1 << 2,
+};
+
+extern int HX_ffs(unsigned long);
+extern void HX_zvecfree(char **);
+extern int HX_fsystem(unsigned int, const char *, const char *, ...);
+extern int HX_vfsystem(unsigned int, const char *, const char *, va_list);
+
+/*
+ * RAND.C
+ */
+extern int HX_rand(void);
+extern unsigned int HX_irand(unsigned int, unsigned int);
+
+#ifdef _WIN32
+# define MAP_FAILED ((void *)-1)
+# define PROT_NONE 0x0
+# define PROT_READ 0x1
+# define PROT_WRITE 0x2
+# define PROT_EXEC 0x4
+# define MAP_SHARED 0x1
+# define MAP_PRIVATE 0x2
+extern void *mmap(void *, size_t, int, int, int, off_t);
+extern int munmap(void *, size_t);
+#endif
+
+/*
+ * INLINE FUNCTIONS
+ */
+static inline int HX_zveclen(const char **args)
+{
+ int argk = 0;
+ while (*args++ != NULL)
+ ++argk;
+ return argk;
+}
+
+#ifdef __cplusplus
+} /* extern "C" */
+
+extern "C++" {
+
+template<typename type> static inline type
+HX_dlsym(void *handle, const char *symbol)
+{
+ return reinterpret_cast<type>(HX_dlsym(handle, symbol));
+}
+
+} /* extern "C++" */
+#endif
+
+#endif /* _LIBHX_MISC_H */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/src/opt.c new/libHX-1.23/src/opt.c
--- old/libHX-1.22/src/opt.c 2008-07-16 21:08:33.000000000 +0200
+++ new/libHX-1.23/src/opt.c 2008-09-03 00:44:01.000000000 +0200
@@ -45,7 +45,11 @@
#include
#include
#include
-#include "libHX.h"
+#include
+#include
+#include
+#include
+#include "internal.h"
/* Definitions */
#define CALL_CB \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/src/other.c new/libHX-1.23/src/other.c
--- old/libHX-1.22/src/other.c 2008-07-16 21:08:33.000000000 +0200
+++ new/libHX-1.23/src/other.c 2008-09-03 00:44:01.000000000 +0200
@@ -19,7 +19,8 @@
# include
# include
#endif
-#include "libHX.h"
+#include
+#include "internal.h"
static int run_program(const char *, const char **, unsigned int);
#ifdef _WIN32
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/src/rand.c new/libHX-1.23/src/rand.c
--- old/libHX-1.22/src/rand.c 2008-07-16 21:08:33.000000000 +0200
+++ new/libHX-1.23/src/rand.c 2008-09-03 00:44:01.000000000 +0200
@@ -16,7 +16,8 @@
#ifdef __unix__
# include
#endif
-#include "libHX.h"
+#include
+#include "internal.h"
static int rand_fd = -1;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/src/string.c new/libHX-1.23/src/string.c
--- old/libHX-1.22/src/string.c 2008-07-16 21:08:33.000000000 +0200
+++ new/libHX-1.23/src/string.c 2008-09-03 00:44:01.000000000 +0200
@@ -1,6 +1,6 @@
/*
* libHX/string.c
- * Copyright © Jan Engelhardt , 1999 - 2007
+ * Copyright © Jan Engelhardt , 1999 - 2008
*
* This file is part of libHX. libHX is free software; you can
* redistribute it and/or modify it under the terms of the GNU
@@ -13,7 +13,8 @@
#include
#include
#include
-#include "libHX.h"
+#include
+#include "internal.h"
static inline unsigned int min_uint(unsigned int a, unsigned int b)
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/src/string.h new/libHX-1.23/src/string.h
--- old/libHX-1.22/src/string.h 2008-07-16 21:08:33.000000000 +0200
+++ new/libHX-1.23/src/string.h 2008-09-03 00:44:01.000000000 +0200
@@ -29,7 +29,7 @@
extern hmc_t *hmc_minit(const void *, size_t);
extern hmc_t *hmc_strasg(hmc_t **, const char *);
extern hmc_t *hmc_memasg(hmc_t **, const void *, size_t);
-extern size_t hmc_length(hmc_t *);
+extern size_t hmc_length(const hmc_t *);
extern hmc_t *hmc_trunc(hmc_t **, size_t);
extern hmc_t *hmc_strcat(hmc_t **, const char *);
extern hmc_t *hmc_memcat(hmc_t **, const void *, size_t);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/src/tc-arbtree.c new/libHX-1.23/src/tc-arbtree.c
--- old/libHX-1.22/src/tc-arbtree.c 2008-07-16 21:08:33.000000000 +0200
+++ new/libHX-1.23/src/tc-arbtree.c 2008-09-03 00:44:01.000000000 +0200
@@ -1,10 +1,13 @@
#include
#include
+#include
#include
#include
#include
#include
-#include
+#include
+#include
+#include
enum {
S_LEFT = 0,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/src/tc-compile.c new/libHX-1.23/src/tc-compile.c
--- old/libHX-1.22/src/tc-compile.c 2008-07-16 21:08:33.000000000 +0200
+++ new/libHX-1.23/src/tc-compile.c 2008-09-03 00:44:01.000000000 +0200
@@ -1,6 +1 @@
-#include
-
-int main(void)
-{
- return 0;
-}
+#include "tx-compile.cpp"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/src/tc-deque.c new/libHX-1.23/src/tc-deque.c
--- old/libHX-1.22/src/tc-deque.c 2008-09-05 22:04:16.000000000 +0200
+++ new/libHX-1.23/src/tc-deque.c 2008-09-03 00:44:01.000000000 +0200
@@ -1 +1 @@
-symbolic link to tx-deque.cpp
+#include "tx-deque.cpp"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/src/tc-dir.c new/libHX-1.23/src/tc-dir.c
--- old/libHX-1.22/src/tc-dir.c 2008-09-05 22:04:16.000000000 +0200
+++ new/libHX-1.23/src/tc-dir.c 2008-09-03 00:44:01.000000000 +0200
@@ -1 +1 @@
-symbolic link to tx-dir.cpp
+#include "tx-dir.cpp"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/src/tc-list.c new/libHX-1.23/src/tc-list.c
--- old/libHX-1.22/src/tc-list.c 2008-09-05 22:04:16.000000000 +0200
+++ new/libHX-1.23/src/tc-list.c 2008-09-03 00:44:01.000000000 +0200
@@ -1 +1 @@
-symbolic link to tx-list.cpp
+#include "tx-list.cpp"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/src/tc-misc.c new/libHX-1.23/src/tc-misc.c
--- old/libHX-1.22/src/tc-misc.c 1970-01-01 01:00:00.000000000 +0100
+++ new/libHX-1.23/src/tc-misc.c 2008-09-03 00:44:01.000000000 +0200
@@ -0,0 +1 @@
+#include "tx-misc.cpp"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/src/tc-other.c new/libHX-1.23/src/tc-other.c
--- old/libHX-1.22/src/tc-other.c 2008-09-05 22:04:16.000000000 +0200
+++ new/libHX-1.23/src/tc-other.c 2008-09-03 00:44:01.000000000 +0200
@@ -1 +1 @@
-symbolic link to tx-other.cpp
+#include "tx-other.cpp"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/src/tc-string.c new/libHX-1.23/src/tc-string.c
--- old/libHX-1.22/src/tc-string.c 2008-09-05 22:04:16.000000000 +0200
+++ new/libHX-1.23/src/tc-string.c 2008-09-03 00:44:01.000000000 +0200
@@ -1 +1 @@
-symbolic link to tx-string.cpp
+#include "tx-string.cpp"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/src/tx-arbtree.cpp new/libHX-1.23/src/tx-arbtree.cpp
--- old/libHX-1.22/src/tx-arbtree.cpp 2008-07-16 21:08:33.000000000 +0200
+++ new/libHX-1.23/src/tx-arbtree.cpp 2008-09-03 00:44:01.000000000 +0200
@@ -1,7 +1,11 @@
+#ifndef __cplusplus
+# include
+#else
+# include <cstdlib>
+#endif
#include
-#include
int main(void)
{
- return 0;
+ return EXIT_SUCCESS;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/src/tx-compile.cpp new/libHX-1.23/src/tx-compile.cpp
--- old/libHX-1.22/src/tx-compile.cpp 2008-07-16 21:08:33.000000000 +0200
+++ new/libHX-1.23/src/tx-compile.cpp 2008-09-03 00:44:01.000000000 +0200
@@ -1,6 +1,12 @@
+/* This file is for testing the cumulative include */
+#ifndef __cplusplus
+# include
+#else
+# include <cstdlib>
+#endif
#include
int main(void)
{
- return 0;
+ return EXIT_SUCCESS;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/src/tx-deque.cpp new/libHX-1.23/src/tx-deque.cpp
--- old/libHX-1.22/src/tx-deque.cpp 2008-07-16 21:08:33.000000000 +0200
+++ new/libHX-1.23/src/tx-deque.cpp 2008-09-03 00:44:01.000000000 +0200
@@ -1,6 +1,11 @@
+#ifndef __cplusplus
+# include
+#else
+# include <cstdlib>
+#endif
#include
int main(void)
{
- return 0;
+ return EXIT_SUCCESS;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/src/tx-dir.cpp new/libHX-1.23/src/tx-dir.cpp
--- old/libHX-1.22/src/tx-dir.cpp 2008-07-16 21:08:33.000000000 +0200
+++ new/libHX-1.23/src/tx-dir.cpp 2008-09-03 00:44:01.000000000 +0200
@@ -1,5 +1,11 @@
-#include
-#include
+#ifndef __cplusplus
+# include
+# include
+#else
+# include <cstdio>
+# include <cstdlib>
+#endif
+#include
int main(void)
{
@@ -11,5 +17,5 @@
printf("\t" "%s\n", n);
HXdir_close(d);
- return 0;
+ return EXIT_SUCCESS;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/src/tx-list.cpp new/libHX-1.23/src/tx-list.cpp
--- old/libHX-1.22/src/tx-list.cpp 2008-07-16 21:08:33.000000000 +0200
+++ new/libHX-1.23/src/tx-list.cpp 2008-09-03 00:44:01.000000000 +0200
@@ -7,7 +7,7 @@
# include
#endif
#include
-#include
+#include
struct text_object {
struct HXlist_head list;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/src/tx-misc.cpp new/libHX-1.23/src/tx-misc.cpp
--- old/libHX-1.22/src/tx-misc.cpp 1970-01-01 01:00:00.000000000 +0100
+++ new/libHX-1.23/src/tx-misc.cpp 2008-09-03 00:44:01.000000000 +0200
@@ -0,0 +1,11 @@
+#ifndef __cplusplus
+# include
+#else
+# include <cstdlib>
+#endif
+#include
+
+int main(void)
+{
+ return EXIT_SUCCESS;
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/src/tx-option.cpp new/libHX-1.23/src/tx-option.cpp
--- old/libHX-1.22/src/tx-option.cpp 2008-07-16 21:08:33.000000000 +0200
+++ new/libHX-1.23/src/tx-option.cpp 2008-09-03 00:44:01.000000000 +0200
@@ -1,6 +1,11 @@
+#ifndef __cplusplus
+# include
+#else
+# include <cstdlib>
+#endif
#include
int main(void)
{
- return 0;
+ return EXIT_SUCCESS;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/src/tx-other.cpp new/libHX-1.23/src/tx-other.cpp
--- old/libHX-1.22/src/tx-other.cpp 2008-07-16 21:08:33.000000000 +0200
+++ new/libHX-1.23/src/tx-other.cpp 2008-09-03 00:44:01.000000000 +0200
@@ -1,4 +1,9 @@
-#include
+#ifndef __cplusplus
+# include
+#else
+# include <cstdlib>
+#endif
+#include
int main(void)
{
@@ -17,5 +22,5 @@
break;
}
- return 0;
+ return EXIT_SUCCESS;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libHX-1.22/src/tx-string.cpp new/libHX-1.23/src/tx-string.cpp
--- old/libHX-1.22/src/tx-string.cpp 2008-07-16 21:08:33.000000000 +0200
+++ new/libHX-1.23/src/tx-string.cpp 2008-09-03 00:44:01.000000000 +0200
@@ -1,9 +1,17 @@
/* long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing long line for testing */
-#include
-#include
-#include
+#ifndef __cplusplus
+# include
+# include
+# include
+#else
+# include <cerrno>
+# include <cstdio>
+# include <cstdlib>
+#endif
+#include
+#include
#include
-#include
+#include "internal.h"
static void t_path(void)
{
@@ -25,7 +33,8 @@
{
char data[5] = "DATA";
- if (snprintf(data, sizeof(data), "12345678") >= sizeof(data))
+ if (snprintf(data, sizeof(data), "12345678") >=
+ static_cast(ssize_t, sizeof(data)))
printf("Not enoguh space\n");
printf("String: >%s<\n", data);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org