oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

use vsnprintf so that we dont need roken

Browse Source
This commit is contained in:
Love Hornquist Astrand
2010-11-27 23:21:39 -08:00
parent d36ee8f0b6
commit d69fcab43f
4 changed files with 4 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
base/Makefile.am
View File

@@ -5,7 +5,6 @@ lib_LTLIBRARIES = libheimbase.la
check_PROGRAMS = test_base check_PROGRAMS = test_base
libheimbase_la_LDFLAGS = -version-info 1:0:0 libheimbase_la_LDFLAGS = -version-info 1:0:0
libheimbase_la_CPPFLAGS = $(ROKEN_RENAME)
if versionscript if versionscript
libheimbase_la_LDFLAGS += $(LDFLAGS_VERSION_SCRIPT)$(srcdir)/version-script.map libheimbase_la_LDFLAGS += $(LDFLAGS_VERSION_SCRIPT)$(srcdir)/version-script.map
@@ -23,14 +22,6 @@ dist_libheimbase_la_SOURCES = \
heimqueue.h \ heimqueue.h \
null.c \ null.c \
number.c \ number.c \
string.c \ string.c
roken_rename.h
if do_roken_rename
nodist_libheimbase_la_SOURCES = snprintf.c
endif
snprintf.c:
$(LN_S) $(top_srcdir)/lib/roken/snprintf.c .
test_base_LDADD = $(LIB_heimbase) test_base_LDADD = $(LIB_heimbase)

10
base/NTMakefile
View File

@@ -35,15 +35,6 @@ RELDIR=base
INCFILES=$(INCDIR)\heimbase.h INCFILES=$(INCDIR)\heimbase.h
{}.c{$(OBJ)}.obj::
$(C2OBJ_P) -I$(SRC)\$(RELDIR) -DROKEN_RENAME
{$(OBJ)}.c{$(OBJ)}.obj::
$(C2OBJ_P) -I$(SRC)\$(RELDIR) -DROKEN_RENAME
$(OBJ)\snprintf.obj: $(SRCDIR)\..\lib\roken\snprintf.c
$(C2OBJ) -I$(SRC)\$(RELDIR) -DROKEN_RENAME
libheimbase_OBJS = \ libheimbase_OBJS = \
$(OBJ)\array.obj \ $(OBJ)\array.obj \
$(OBJ)\bool.obj \ $(OBJ)\bool.obj \
@@ -51,7 +42,6 @@ libheimbase_OBJS = \
$(OBJ)\heimbase.obj \ $(OBJ)\heimbase.obj \
$(OBJ)\null.obj \ $(OBJ)\null.obj \
$(OBJ)\number.obj \ $(OBJ)\number.obj \
$(OBJ)\snprintf.obj \
$(OBJ)\string.obj $(OBJ)\string.obj
$(LIBHEIMBASE): $(libheimbase_OBJS) $(LIBHEIMBASE): $(libheimbase_OBJS)

2
base/baselocl.h
View File

@@ -41,8 +41,6 @@
#include <errno.h> #include <errno.h>
#include <limits.h> #include <limits.h>
#include <roken.h>
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif #endif

9
base/heimbase.c
View File

@@ -370,13 +370,10 @@ heim_abort(const char *fmt, ...)
void void
heim_abortv(const char *fmt, va_list ap) heim_abortv(const char *fmt, va_list ap)
{ {
char *str = NULL; static char str[1024];
int ret;
ret = vasprintf(&str, fmt, ap); vsnprintf(str, sizeof(str), fmt, ap);
if (ret > 0 && str) { syslog(LOG_ERR, "heim_abort: %s", str);
syslog(LOG_ERR, "heim_abort: %s", str);
}
abort(); abort();
} }