Thread: [freestdf-commits] SF.net SVN: freestdf: [255] trunk
Status: Beta
Brought to you by:
vapier
Menu
▾
▴
freestdf-cvs
|
From: <va...@us...> - 2006-10-04 06:40:21
|
Revision: 255
http://svn.sourceforge.net/freestdf/?rev=255&view=rev
Author: vapier
Date: 2006-09-28 03:05:43 -0700 (Thu, 28 Sep 2006)
Log Message:
-----------
simpler autogen scripts
Modified Paths:
--------------
trunk/liblzw/autogen.sh
trunk/libstdf/autogen.sh
Modified: trunk/liblzw/autogen.sh
===================================================================
--- trunk/liblzw/autogen.sh 2006-09-28 09:11:33 UTC (rev 254)
+++ trunk/liblzw/autogen.sh 2006-09-28 10:05:43 UTC (rev 255)
@@ -1,18 +1,14 @@
-#!/bin/sh
+#!/bin/sh -xe
if test -d .svn ; then
if test -d ../m4 ; then
- rm -rf m4 || exit 1
- mkdir -p m4 || exit 1
- cp ../m4/*.m4 m4/ || exit 1
+ rm -rf m4
+ mkdir -p m4
+ cp ../m4/*.m4 m4/
fi
fi
-aclocal -I m4 || exit 1
-autoheader || exit 1
-libtoolize --automake -c -f || exit 1
-autoconf || exit 1
-automake -a -c || exit 1
+autoreconf
if test -x ./test.sh ; then
exec ./test.sh "$@"
Modified: trunk/libstdf/autogen.sh
===================================================================
--- trunk/libstdf/autogen.sh 2006-09-28 09:11:33 UTC (rev 254)
+++ trunk/libstdf/autogen.sh 2006-09-28 10:05:43 UTC (rev 255)
@@ -1,22 +1,18 @@
-#!/bin/sh
+#!/bin/sh -xe
if test -d .svn ; then
if test -d ../m4 ; then
- rm -rf m4 || exit 1
- mkdir -p m4 || exit 1
- cp ../m4/*.m4 m4/ || exit 1
+ rm -rf m4
+ mkdir -p m4
+ cp ../m4/*.m4 m4/
fi
if test -d ../liblzw ; then
- cp ../liblzw/lzw.h include/ || exit 1
- cp ../liblzw/lzw.c src/ || exit 1
+ cp ../liblzw/lzw.h include/
+ cp ../liblzw/lzw.c src/
fi
fi
-aclocal -I m4 || exit 1
-autoheader || exit 1
-libtoolize --automake -c -f || exit 1
-autoconf || exit 1
-automake -a -c || exit 1
+autoreconf
if test -x ./test.sh ; then
exec ./test.sh "$@"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <va...@us...> - 2006-10-04 06:40:22
|
Revision: 249
http://svn.sourceforge.net/freestdf/?rev=249&view=rev
Author: vapier
Date: 2006-09-28 01:31:34 -0700 (Thu, 28 Sep 2006)
Log Message:
-----------
lets try deleting/readding bzip2s then ...
Removed Paths:
-------------
trunk/liblzw/tests/lot.good.bz2
trunk/liblzw/tests/simple.good.bz2
trunk/liblzw/tests/simple2.good.bz2
trunk/libstdf/tests/ascii.good.bz2
trunk/libstdf/tests/create.good.bz2
trunk/libstdf/tests/html.good.bz2
trunk/libstdf/tests/stats.good.bz2
trunk/libstdf/tests/stdf.bz2
Deleted: trunk/liblzw/tests/lot.good.bz2
===================================================================
(Binary files differ)
Deleted: trunk/liblzw/tests/simple.good.bz2
===================================================================
(Binary files differ)
Deleted: trunk/liblzw/tests/simple2.good.bz2
===================================================================
(Binary files differ)
Deleted: trunk/libstdf/tests/ascii.good.bz2
===================================================================
(Binary files differ)
Deleted: trunk/libstdf/tests/create.good.bz2
===================================================================
(Binary files differ)
Deleted: trunk/libstdf/tests/html.good.bz2
===================================================================
(Binary files differ)
Deleted: trunk/libstdf/tests/stats.good.bz2
===================================================================
(Binary files differ)
Deleted: trunk/libstdf/tests/stdf.bz2
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <va...@us...> - 2006-10-04 06:40:22
|
Revision: 250
http://svn.sourceforge.net/freestdf/?rev=250&view=rev
Author: vapier
Date: 2006-09-28 01:33:17 -0700 (Thu, 28 Sep 2006)
Log Message:
-----------
re-import bz2 files
Added Paths:
-----------
trunk/liblzw/tests/lot.good.bz2
trunk/liblzw/tests/simple.good.bz2
trunk/liblzw/tests/simple2.good.bz2
trunk/libstdf/tests/ascii.good.bz2
trunk/libstdf/tests/create.good.bz2
trunk/libstdf/tests/html.good.bz2
trunk/libstdf/tests/stats.good.bz2
trunk/libstdf/tests/stdf.bz2
Added: trunk/liblzw/tests/lot.good.bz2
===================================================================
(Binary files differ)
Property changes on: trunk/liblzw/tests/lot.good.bz2
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/liblzw/tests/simple.good.bz2
===================================================================
(Binary files differ)
Property changes on: trunk/liblzw/tests/simple.good.bz2
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/liblzw/tests/simple2.good.bz2
===================================================================
(Binary files differ)
Property changes on: trunk/liblzw/tests/simple2.good.bz2
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/libstdf/tests/ascii.good.bz2
===================================================================
(Binary files differ)
Property changes on: trunk/libstdf/tests/ascii.good.bz2
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/libstdf/tests/create.good.bz2
===================================================================
(Binary files differ)
Property changes on: trunk/libstdf/tests/create.good.bz2
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/libstdf/tests/html.good.bz2
===================================================================
(Binary files differ)
Property changes on: trunk/libstdf/tests/html.good.bz2
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/libstdf/tests/stats.good.bz2
===================================================================
(Binary files differ)
Property changes on: trunk/libstdf/tests/stats.good.bz2
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/libstdf/tests/stdf.bz2
===================================================================
(Binary files differ)
Property changes on: trunk/libstdf/tests/stdf.bz2
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <va...@us...> - 2006-10-04 06:41:20
|
Revision: 253
http://svn.sourceforge.net/freestdf/?rev=253&view=rev
Author: vapier
Date: 2006-09-28 01:39:27 -0700 (Thu, 28 Sep 2006)
Log Message:
-----------
make sure libtool does not supress stderr
Modified Paths:
--------------
trunk/liblzw/Makefile.am
trunk/libstdf/src/Makefile.am
Modified: trunk/liblzw/Makefile.am
===================================================================
--- trunk/liblzw/Makefile.am 2006-09-28 08:37:55 UTC (rev 252)
+++ trunk/liblzw/Makefile.am 2006-09-28 08:39:27 UTC (rev 253)
@@ -7,9 +7,9 @@
noinst_HEADERS = lzw_internal.h
lib_LTLIBRARIES = liblzw.la
-
liblzw_la_SOURCES = lzw.c
-liblzw_la_LDFLAGS = -version-info 0:1:0
+liblzw_la_CFLAGS = -no-suppress
+liblzw_la_LDFLAGS = -no-suppress -version-info 0:1:0
EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL NEWS README
Modified: trunk/libstdf/src/Makefile.am
===================================================================
--- trunk/libstdf/src/Makefile.am 2006-09-28 08:37:55 UTC (rev 252)
+++ trunk/libstdf/src/Makefile.am 2006-09-28 08:39:27 UTC (rev 253)
@@ -7,7 +7,6 @@
@ZIP_CFLAGS@ @GZIP_CFLAGS@ @BZIP2_CFLAGS@
lib_LTLIBRARIES = libstdf.la
-
EXTRA_STDF_SOURCES :=
if HAVE_LZW
EXTRA_STDF_SOURCES += lzw.c
@@ -17,6 +16,7 @@
dtc.c \
rec.c \
$(EXTRA_STDF_SOURCES)
-libstdf_la_LDFLAGS = -version-info 0:1:0
+libstdf_la_CFLAGS = -no-suppress
+libstdf_la_LDFLAGS = -no-suppress -version-info 0:1:0
libstdf_la_LIBADD = @ZIP_LIBS@ @GZIP_LIBS@ @BZIP2_LIBS@ @DEBUG_LIBS@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <va...@us...> - 2007-02-19 03:36:36
|
Revision: 282
http://svn.sourceforge.net/freestdf/?rev=282&view=rev
Author: vapier
Date: 2007-02-18 19:36:34 -0800 (Sun, 18 Feb 2007)
Log Message:
-----------
rewrite gcc attribute handling so we can include some attributes with exported headers (like __const__)
Modified Paths:
--------------
trunk/libstdf/TODO
trunk/libstdf/configure.ac
trunk/libstdf/include/libstdf_funcs.h
trunk/libstdf/include/libstdf_internal.h
trunk/libstdf/include/libstdf_systems.h
trunk/libstdf/src/dtc.h
trunk/libstdf/src/rec.c
trunk/libstdf/src/rec.h
Added Paths:
-----------
trunk/m4/stdf_gcc_attributes.m4
Modified: trunk/libstdf/TODO
===================================================================
--- trunk/libstdf/TODO 2007-02-18 16:28:05 UTC (rev 281)
+++ trunk/libstdf/TODO 2007-02-19 03:36:34 UTC (rev 282)
@@ -18,3 +18,5 @@
- STDF 'lint' remover to 'shrink' STDF files ...
- check if PTR records repeat the entries for limits, test name, etc...
If so, then remove duplicate entries after the first occurence
+
+ - stop polluting exported name space with HAVE_* defines
Modified: trunk/libstdf/configure.ac
===================================================================
--- trunk/libstdf/configure.ac 2007-02-18 16:28:05 UTC (rev 281)
+++ trunk/libstdf/configure.ac 2007-02-19 03:36:34 UTC (rev 282)
@@ -16,6 +16,7 @@
])
AC_STDF_TYPE_CHECKS
+AC_STDF_GCC_ATTRIBUTES
AM_STDF_VAPIER_DEV
AM_STDF_DEBUG_OPTIONS
Modified: trunk/libstdf/include/libstdf_funcs.h
===================================================================
--- trunk/libstdf/include/libstdf_funcs.h 2007-02-18 16:28:05 UTC (rev 281)
+++ trunk/libstdf/include/libstdf_funcs.h 2007-02-19 03:36:34 UTC (rev 282)
@@ -33,11 +33,11 @@
#define stdf_get_rec_name_from_head(h) stdf_get_rec_name(h.REC_TYP, h.REC_SUB)
#define stdf_get_rec_name_from_rec(r) stdf_get_rec_name(r->header.REC_TYP, r->header.REC_SUB)
-extern int stdf_rec_to_idx(void*); /**< Normalize the record namespace into array indexes */
-extern int stdf_rec_to_idx_count(); /**< Highest array reference the normalize will return */
-extern int stdf_rec_name_to_idx(char*); /**< Normalize the record names into array indexes */
+extern int stdf_rec_to_idx(void*) stdf_attribute_const; /**< Normalize the record namespace into array indexes */
+extern int stdf_rec_to_idx_count(void) stdf_attribute_const;/**< Highest array reference the normalize will return */
+extern int stdf_rec_name_to_idx(char*) stdf_attribute_const;/**< Normalize the record names into array indexes */
-extern char* stdf_get_Vn_name(int); /**< Translate a Vn type into the 2 letter spec name */
-extern void stdf_get_Vn_name_r(int, char*); /**< Translate a Vn type into the 2 letter spec name (reentrant version) */
+extern char* stdf_get_Vn_name(int) stdf_attribute_const; /**< Translate a Vn type into the 2 letter spec name */
+extern void stdf_get_Vn_name_r(int, char*) stdf_attribute_const; /**< Translate a Vn type into the 2 letter spec name (reentrant version) */
#endif /* _LIBSTDF_FUNCS_H */
Modified: trunk/libstdf/include/libstdf_internal.h
===================================================================
--- trunk/libstdf/include/libstdf_internal.h 2007-02-18 16:28:05 UTC (rev 281)
+++ trunk/libstdf/include/libstdf_internal.h 2007-02-19 03:36:34 UTC (rev 282)
@@ -12,6 +12,27 @@
#ifndef _LIBSTDF_INTERNAL_H
#define _LIBSTDF_INTERNAL_H
+#ifdef HAVE_ZIP
+# define USE_ZIP(x) x
+#else
+# define USE_ZIP(x)
+#endif
+#ifdef HAVE_GZIP
+# define USE_GZIP(x) x
+#else
+# define USE_GZIP(x)
+#endif
+#ifdef HAVE_BZIP2
+# define USE_BZIP2(x) x
+#else
+# define USE_BZIP2(x)
+#endif
+#ifdef HAVE_LZW
+# define USE_LZW(x) x
+#else
+# define USE_LZW(x)
+#endif
+
/* STDF File structure */
#define __STDF_HOST_BYTE_ORDER BYTE_ORDER
@@ -101,31 +122,4 @@
# include <efence.h>
#endif
-
-/**
- * @brief Internal macros for fun ELF tricks.
- */
-#ifndef __GNUC_PREREQ
-# define __GNUC_PREREQ(maj, min) 0
-#endif
-#if __GNUC_PREREQ(3,3) && defined(__ELF__)
-# define attribute_unused __attribute__ ((unused))
-# if !defined(weak_alias)
-# define weak_alias(name, aliasname) \
- extern __typeof (name) aliasname __attribute__ ((weak, alias (#name)))
-# endif
-# if !defined(strong_alias)
-# define strong_alias(name, aliasname) \
- extern __typeof (name) aliasname __attribute__ ((alias (#name)))
-# endif
-# if !defined(attribute_hidden)
-# define attribute_hidden __attribute__ ((visibility ("hidden")))
-# endif
-#else
-# define attribute_unused
-# if !defined(attribute_hidden)
-# define attribute_hidden
-# endif
-#endif
-
#endif /* _LIBSTDF_INTERNAL_H */
Modified: trunk/libstdf/include/libstdf_systems.h
===================================================================
--- trunk/libstdf/include/libstdf_systems.h 2007-02-18 16:28:05 UTC (rev 281)
+++ trunk/libstdf/include/libstdf_systems.h 2007-02-19 03:36:34 UTC (rev 282)
@@ -85,6 +85,20 @@
# include <byteswap.h>
#endif
+#if defined(HAVE_ZIP)
+# include <zzip/zzip.h>
+#endif
+#if defined(HAVE_GZIP)
+# include <zlib.h>
+#endif
+#if defined(HAVE_BZIP2)
+# include <bzlib.h>
+#endif
+#if defined(HAVE_LZW)
+# define __IN_LIBLZW
+# include <lzw.h>
+#endif
+
/* Support for Tru64 */
#if defined(HAVE_CMPLRS_HOST_H)
# include <cmplrs/host.h>
@@ -136,35 +150,40 @@
# error the configure script with the --enable-endian option.
#endif
-#if HAVE_ZIP
-# include <zzip/zzip.h>
-# define USE_ZIP(x) x
+/* i'll see you in hell windows */
+#if !defined(O_BINARY)
+# define O_BINARY 0x00
+#endif
+
+/**
+ * @brief Internal macros for fun ELF tricks.
+ */
+#ifdef STDF_HAVE_GCC_ATTRIBUTE_UNUSED
+# define stdf_attribute_unused __attribute__ ((__unused__))
#else
-# define USE_ZIP(x)
+# define stdf_attribute_unused
#endif
-#if HAVE_GZIP
-# include <zlib.h>
-# define USE_GZIP(x) x
+#ifdef STDF_HAVE_GCC_ATTRIBUTE_CONST
+# define stdf_attribute_const __attribute__ ((__const__))
#else
-# define USE_GZIP(x)
+# define stdf_attribute_const
#endif
-#if HAVE_BZIP2
-# include <bzlib.h>
-# define USE_BZIP2(x) x
+#ifdef STDF_HAVE_GCC_ATTRIBUTE_VISIBILITY
+# define stdf_attribute_hidden __attribute__ ((__visibility__("hidden")))
#else
-# define USE_BZIP2(x)
+# define stdf_attribute_hidden
#endif
-#if HAVE_LZW
-# define __IN_LIBLZW
-# include <lzw.h>
-# define USE_LZW(x) x
+#ifdef STDF_HAVE_GCC_ATTRIBUTE_STRONG_ALIAS
+# define stdf_attribute_strong_alias(name, aliasname) \
+ extern __typeof (name) aliasname __attribute__ ((__alias__ (#name)))
#else
-# define USE_LZW(x)
+# define stdf_attribute_strong_alias(name, aliasname)
#endif
-
-/* i'll see you in hell windows */
-#if !defined(O_BINARY)
-# define O_BINARY 0x00
+#ifdef STDF_HAVE_GCC_ATTRIBUTE_WEAK_ALIAS
+# define stdf_attribute_weak_alias(name, aliasname) \
+ extern __typeof (name) aliasname __attribute__ ((__weak__, __alias__ (#name)))
+#else
+# define stdf_attribute_weak_alias(name, aliasname)
#endif
#endif /* _LIBSTDF_SYSTEMS_H */
Modified: trunk/libstdf/src/dtc.h
===================================================================
--- trunk/libstdf/src/dtc.h 2007-02-18 16:28:05 UTC (rev 281)
+++ trunk/libstdf/src/dtc.h 2007-02-19 03:36:34 UTC (rev 282)
@@ -14,45 +14,45 @@
#include <libstdf.h>
-extern void __byte_order_change(int, int, byte_t*, int) attribute_hidden;
+extern void __byte_order_change(int, int, byte_t*, int) stdf_attribute_hidden;
#define __byte_order_to_host(b,p,l) __byte_order_change(b, __STDF_HOST_BYTE_ORDER, p, l)
#define __byte_order_to_src(b,p,l) __byte_order_change(__STDF_HOST_BYTE_ORDER, b, p, l)
#define _stdf_byte_order_to_host(f,v,l) __byte_order_to_host(f->byte_order, (byte_t*)(v), l)
#define _stdf_byte_order_to_src(f,v,l) __byte_order_to_src(f->byte_order, (byte_t*)(v), l)
#ifdef STDF_VER3
-extern void _stdf_read_dtc_Cx(stdf_file*, stdf_dtc_Cn*, int) attribute_hidden;
+extern void _stdf_read_dtc_Cx(stdf_file*, stdf_dtc_Cn*, int) stdf_attribute_hidden;
#endif
-extern void _stdf_read_dtc_Cn(stdf_file*, stdf_dtc_Cn*) attribute_hidden;
-extern void _stdf_read_dtc_Bn(stdf_file*, stdf_dtc_Bn*) attribute_hidden;
-extern void _stdf_read_dtc_Dn(stdf_file*, stdf_dtc_Dn*) attribute_hidden;
+extern void _stdf_read_dtc_Cn(stdf_file*, stdf_dtc_Cn*) stdf_attribute_hidden;
+extern void _stdf_read_dtc_Bn(stdf_file*, stdf_dtc_Bn*) stdf_attribute_hidden;
+extern void _stdf_read_dtc_Dn(stdf_file*, stdf_dtc_Dn*) stdf_attribute_hidden;
-extern void _stdf_read_dtc_C1(stdf_file*, stdf_dtc_C1*) attribute_hidden;
-extern void _stdf_read_dtc_B1(stdf_file*, stdf_dtc_B1*) attribute_hidden;
-extern void _stdf_read_dtc_N1(stdf_file*, stdf_dtc_N1*) attribute_hidden;
-extern void _stdf_read_dtc_U1(stdf_file*, stdf_dtc_U1*) attribute_hidden;
-extern void _stdf_read_dtc_U2(stdf_file*, stdf_dtc_U2*) attribute_hidden;
-extern void _stdf_read_dtc_U4(stdf_file*, stdf_dtc_U4*) attribute_hidden;
-extern void _stdf_read_dtc_I1(stdf_file*, stdf_dtc_I1*) attribute_hidden;
-extern void _stdf_read_dtc_I2(stdf_file*, stdf_dtc_I2*) attribute_hidden;
-extern void _stdf_read_dtc_I4(stdf_file*, stdf_dtc_I4*) attribute_hidden;
-extern void _stdf_read_dtc_R4(stdf_file*, stdf_dtc_R4*) attribute_hidden;
-extern void _stdf_read_dtc_R8(stdf_file*, stdf_dtc_R8*) attribute_hidden;
+extern void _stdf_read_dtc_C1(stdf_file*, stdf_dtc_C1*) stdf_attribute_hidden;
+extern void _stdf_read_dtc_B1(stdf_file*, stdf_dtc_B1*) stdf_attribute_hidden;
+extern void _stdf_read_dtc_N1(stdf_file*, stdf_dtc_N1*) stdf_attribute_hidden;
+extern void _stdf_read_dtc_U1(stdf_file*, stdf_dtc_U1*) stdf_attribute_hidden;
+extern void _stdf_read_dtc_U2(stdf_file*, stdf_dtc_U2*) stdf_attribute_hidden;
+extern void _stdf_read_dtc_U4(stdf_file*, stdf_dtc_U4*) stdf_attribute_hidden;
+extern void _stdf_read_dtc_I1(stdf_file*, stdf_dtc_I1*) stdf_attribute_hidden;
+extern void _stdf_read_dtc_I2(stdf_file*, stdf_dtc_I2*) stdf_attribute_hidden;
+extern void _stdf_read_dtc_I4(stdf_file*, stdf_dtc_I4*) stdf_attribute_hidden;
+extern void _stdf_read_dtc_R4(stdf_file*, stdf_dtc_R4*) stdf_attribute_hidden;
+extern void _stdf_read_dtc_R8(stdf_file*, stdf_dtc_R8*) stdf_attribute_hidden;
-extern void _stdf_read_dtc_xN1(stdf_file*, stdf_dtc_xN1*, stdf_dtc_U2) attribute_hidden;
-extern void _stdf_read_dtc_xU1(stdf_file*, stdf_dtc_xU1*, stdf_dtc_U2) attribute_hidden;
-extern void _stdf_read_dtc_xU2(stdf_file*, stdf_dtc_xU2*, stdf_dtc_U2) attribute_hidden;
-extern void _stdf_read_dtc_xR4(stdf_file*, stdf_dtc_xR4*, stdf_dtc_U2) attribute_hidden;
+extern void _stdf_read_dtc_xN1(stdf_file*, stdf_dtc_xN1*, stdf_dtc_U2) stdf_attribute_hidden;
+extern void _stdf_read_dtc_xU1(stdf_file*, stdf_dtc_xU1*, stdf_dtc_U2) stdf_attribute_hidden;
+extern void _stdf_read_dtc_xU2(stdf_file*, stdf_dtc_xU2*, stdf_dtc_U2) stdf_attribute_hidden;
+extern void _stdf_read_dtc_xR4(stdf_file*, stdf_dtc_xR4*, stdf_dtc_U2) stdf_attribute_hidden;
#define free_x(x) if (x) free(x)
#define free_xU1(x) free_x(x)
#define free_xU2(x) free_x(x)
#define free_xR4(x) free_x(x)
-extern void _stdf_read_dtc_xCn(stdf_file*, stdf_dtc_xCn*, stdf_dtc_U2) attribute_hidden;
-extern void free_xCn(stdf_dtc_xCn, stdf_dtc_U2) attribute_hidden;
+extern void _stdf_read_dtc_xCn(stdf_file*, stdf_dtc_xCn*, stdf_dtc_U2) stdf_attribute_hidden;
+extern void free_xCn(stdf_dtc_xCn, stdf_dtc_U2) stdf_attribute_hidden;
-extern void _stdf_read_dtc_Vn(stdf_file*, stdf_dtc_Vn*, stdf_dtc_U2) attribute_hidden;
-extern void free_Vn(stdf_dtc_Vn, stdf_dtc_U2) attribute_hidden;
+extern void _stdf_read_dtc_Vn(stdf_file*, stdf_dtc_Vn*, stdf_dtc_U2) stdf_attribute_hidden;
+extern void free_Vn(stdf_dtc_Vn, stdf_dtc_U2) stdf_attribute_hidden;
#define _stdf_write_byte(file, byte) \
*file->_write_pos++ = byte
Modified: trunk/libstdf/src/rec.c
===================================================================
--- trunk/libstdf/src/rec.c 2007-02-18 16:28:05 UTC (rev 281)
+++ trunk/libstdf/src/rec.c 2007-02-19 03:36:34 UTC (rev 282)
@@ -19,7 +19,7 @@
*/
-char *stdf_rec_names[] = {
+static char *stdf_rec_names[] = {
"???",
"FAR", "ATR", "MIR", "MRR", "PCR", "HBR",
"SBR", "PMR", "PGR", "PLR", "RDR", "SDR",
@@ -72,7 +72,7 @@
default: return 0;
}
}
-int stdf_rec_to_idx_count()
+int stdf_rec_to_idx_count(void)
{
return 32;
}
@@ -1009,7 +1009,7 @@
return bps;
}
-stdf_rec_eps* stdf_read_rec_eps(attribute_unused stdf_file *file)
+stdf_rec_eps* stdf_read_rec_eps(stdf_attribute_unused stdf_file *file)
{
stdf_rec_eps *eps = __malloc_rec(stdf_rec_eps);
return eps;
@@ -1119,12 +1119,12 @@
#define _len_dtcXN(xn, cnt) (sizeof(*(xn)) * (cnt / 2 + cnt % 2))
#define booga(a,b) 0
-static inline size_t _calc_rec_len_far(attribute_unused stdf_file *f, stdf_rec_far *r)
+static inline size_t _calc_rec_len_far(stdf_attribute_unused stdf_file *f, stdf_rec_far *r)
{
return sizeof(r->CPU_TYPE) + sizeof(r->STDF_VER);
}
-static inline size_t _calc_rec_len_atr(attribute_unused stdf_file *f, stdf_rec_atr *r)
+static inline size_t _calc_rec_len_atr(stdf_attribute_unused stdf_file *f, stdf_rec_atr *r)
{
return sizeof(r->MOD_TIM) + _lenCn(r->CMD_LINE);
}
@@ -1186,7 +1186,7 @@
return (f->ver == 3 ? _CALC_REC_LEN_MRR_v3(r) : _CALC_REC_LEN_MRR_v4(r));
}
-static inline size_t _calc_rec_len_pcr(attribute_unused stdf_file *f, stdf_rec_pcr *r)
+static inline size_t _calc_rec_len_pcr(stdf_attribute_unused stdf_file *f, stdf_rec_pcr *r)
{
return
sizeof(r->HEAD_NUM) + sizeof(r->SITE_NUM) + sizeof(r->PART_CNT) +
@@ -1194,21 +1194,21 @@
sizeof(r->FUNC_CNT);
}
-static inline size_t _calc_rec_len_hbr(attribute_unused stdf_file *f, stdf_rec_hbr *r)
+static inline size_t _calc_rec_len_hbr(stdf_attribute_unused stdf_file *f, stdf_rec_hbr *r)
{
return
sizeof(r->HEAD_NUM) + sizeof(r->SITE_NUM) + sizeof(r->HBIN_NUM) +
sizeof(r->HBIN_CNT) + sizeof(r->HBIN_PF) + _lenCn(r->HBIN_NAM);
}
-static inline size_t _calc_rec_len_sbr(attribute_unused stdf_file *f, stdf_rec_sbr *r)
+static inline size_t _calc_rec_len_sbr(stdf_attribute_unused stdf_file *f, stdf_rec_sbr *r)
{
return
sizeof(r->HEAD_NUM) + sizeof(r->SITE_NUM) + sizeof(r->SBIN_NUM) +
sizeof(r->SBIN_CNT) + sizeof(r->SBIN_PF) + _lenCn(r->SBIN_NAM);
}
-static inline size_t _calc_rec_len_pmr(attribute_unused stdf_file *f, stdf_rec_pmr *r)
+static inline size_t _calc_rec_len_pmr(stdf_attribute_unused stdf_file *f, stdf_rec_pmr *r)
{
return
sizeof(r->PMR_INDX) + sizeof(r->CHAN_TYP) + _lenCn(r->CHAN_NAM) +
@@ -1216,14 +1216,14 @@
sizeof(r->SITE_NUM);
}
-static inline size_t _calc_rec_len_pgr(attribute_unused stdf_file *f, stdf_rec_pgr *r)
+static inline size_t _calc_rec_len_pgr(stdf_attribute_unused stdf_file *f, stdf_rec_pgr *r)
{
return
sizeof(r->GRP_INDX) + _lenCn(r->GRP_NAM) +
sizeof(r->INDX_CNT) + _len_dtcX(r->PMR_INDX, r->INDX_CNT);
}
-static inline size_t _calc_rec_len_plr(attribute_unused stdf_file *f, stdf_rec_plr *r)
+static inline size_t _calc_rec_len_plr(stdf_attribute_unused stdf_file *f, stdf_rec_plr *r)
{
return
sizeof(r->GRP_CNT) +
@@ -1233,12 +1233,12 @@
_len_dtcXCN(r->PGM_CHAL, r->GRP_CNT) + _len_dtcXCN(r->RTN_CHAL, r->GRP_CNT);
}
-static inline size_t _calc_rec_len_rdr(attribute_unused stdf_file *f, stdf_rec_rdr *r)
+static inline size_t _calc_rec_len_rdr(stdf_attribute_unused stdf_file *f, stdf_rec_rdr *r)
{
return sizeof(r->NUM_BINS) + _len_dtcX(r->RTST_BIN, r->NUM_BINS);
}
-static inline size_t _calc_rec_len_sdr(attribute_unused stdf_file *f, stdf_rec_sdr *r)
+static inline size_t _calc_rec_len_sdr(stdf_attribute_unused stdf_file *f, stdf_rec_sdr *r)
{
return
sizeof(r->HEAD_NUM) + sizeof(r->SITE_GRP) + sizeof(r->SITE_CNT) +
@@ -1295,7 +1295,7 @@
return (f->ver == 3 ? _CALC_REC_LEN_WRR_v3(r) : _CALC_REC_LEN_WRR_v4(r));
}
-static inline size_t _calc_rec_len_wcr(attribute_unused stdf_file *f, stdf_rec_wcr *r)
+static inline size_t _calc_rec_len_wcr(stdf_attribute_unused stdf_file *f, stdf_rec_wcr *r)
{
return
sizeof(r->WAFR_SIZ) + sizeof(r->DIE_HT) + sizeof(r->DIE_WID) +
@@ -1349,7 +1349,7 @@
#ifdef STDF_VER3
-static inline size_t _calc_rec_len_pdr(attribute_unused stdf_file *f, stdf_rec_pdr *r)
+static inline size_t _calc_rec_len_pdr(stdf_attribute_unused stdf_file *f, stdf_rec_pdr *r)
{
return
sizeof(r->TEST_NUM) + sizeof(r->DESC_FLG) + sizeof(r->OPT_FLAG) +
@@ -1360,7 +1360,7 @@
sizeof(r->HI_LIMIT) + _lenCn(r->TEST_NAM) + _lenCn(r->SEQ_NAME);
}
-static inline size_t _calc_rec_len_fdr(attribute_unused stdf_file *f, stdf_rec_fdr *r)
+static inline size_t _calc_rec_len_fdr(stdf_attribute_unused stdf_file *f, stdf_rec_fdr *r)
{
return
sizeof(r->TEST_NUM) + sizeof(r->DESC_FLG) +
@@ -1398,7 +1398,7 @@
return (f->ver == 3 ? _CALC_REC_LEN_TSR_v3(r) : _CALC_REC_LEN_TSR_v4(r));
}
-static inline size_t _calc_rec_len_ptr(attribute_unused stdf_file *f, stdf_rec_ptr *r)
+static inline size_t _calc_rec_len_ptr(stdf_attribute_unused stdf_file *f, stdf_rec_ptr *r)
{
return
sizeof(r->TEST_NUM) + sizeof(r->HEAD_NUM) + sizeof(r->SITE_NUM) +
@@ -1410,7 +1410,7 @@
_lenCn(r->C_HLMFMT) + sizeof(r->LO_SPEC) + sizeof(r->HI_SPEC);
}
-static inline size_t _calc_rec_len_mpr(attribute_unused stdf_file *f, stdf_rec_mpr *r)
+static inline size_t _calc_rec_len_mpr(stdf_attribute_unused stdf_file *f, stdf_rec_mpr *r)
{
return
sizeof(r->TEST_NUM) + sizeof(r->HEAD_NUM) + sizeof(r->SITE_NUM) +
@@ -1426,7 +1426,7 @@
sizeof(r->HI_SPEC);
}
-static inline size_t _calc_rec_len_ftr(attribute_unused stdf_file *f, stdf_rec_ftr *r)
+static inline size_t _calc_rec_len_ftr(stdf_attribute_unused stdf_file *f, stdf_rec_ftr *r)
{
return
sizeof(r->TEST_NUM) + sizeof(r->HEAD_NUM) + sizeof(r->SITE_NUM) +
@@ -1442,33 +1442,33 @@
_lenDn(r->SPIN_MAP);
}
-static inline size_t _calc_rec_len_bps(attribute_unused stdf_file *f, attribute_unused stdf_rec_bps *r)
+static inline size_t _calc_rec_len_bps(stdf_attribute_unused stdf_file *f, stdf_attribute_unused stdf_rec_bps *r)
{
return _lenCn(r->SEQ_NAME);
}
-static inline size_t _calc_rec_len_eps(attribute_unused stdf_file *f, attribute_unused stdf_rec_eps *r)
+static inline size_t _calc_rec_len_eps(stdf_attribute_unused stdf_file *f, stdf_attribute_unused stdf_rec_eps *r)
{
return 0;
}
#ifdef STDF_VER3
-static inline size_t _calc_rec_len_shb(attribute_unused stdf_file *f, stdf_rec_shb *r)
+static inline size_t _calc_rec_len_shb(stdf_attribute_unused stdf_file *f, stdf_rec_shb *r)
{
return
sizeof(r->HEAD_NUM) + sizeof(r->SITE_NUM) + sizeof(r->HBIN_NUM) +
sizeof(r->HBIN_CNT) + _lenCn(r->HBIN_NAM);
}
-static inline size_t _calc_rec_len_ssb(attribute_unused stdf_file *f, stdf_rec_ssb *r)
+static inline size_t _calc_rec_len_ssb(stdf_attribute_unused stdf_file *f, stdf_rec_ssb *r)
{
return
sizeof(r->HEAD_NUM) + sizeof(r->SITE_NUM) + sizeof(r->SBIN_NUM) +
sizeof(r->SBIN_CNT) + _lenCn(r->SBIN_NAM);
}
-static inline size_t _calc_rec_len_sts(attribute_unused stdf_file *f, stdf_rec_sts *r)
+static inline size_t _calc_rec_len_sts(stdf_attribute_unused stdf_file *f, stdf_rec_sts *r)
{
return
sizeof(r->HEAD_NUM) + sizeof(r->SITE_NUM) + sizeof(r->TEST_NUM) +
@@ -1479,7 +1479,7 @@
_lenCn(r->SEQ_NAME) + _lenCn(r->TEST_LBL);
}
-static inline size_t _calc_rec_len_scr(attribute_unused stdf_file *f, stdf_rec_scr *r)
+static inline size_t _calc_rec_len_scr(stdf_attribute_unused stdf_file *f, stdf_rec_scr *r)
{
return
sizeof(r->HEAD_NUM) + sizeof(r->SITE_NUM) + sizeof(r->FINISH_T) +
@@ -1489,13 +1489,13 @@
#endif
-static inline size_t _calc_rec_len_gdr(attribute_unused stdf_file *f, attribute_unused stdf_rec_gdr *r)
+static inline size_t _calc_rec_len_gdr(stdf_attribute_unused stdf_file *f, stdf_attribute_unused stdf_rec_gdr *r)
{
warnf("Not implemented");
return 0;
}
-static inline size_t _calc_rec_len_dtr(attribute_unused stdf_file *f, stdf_rec_dtr *r)
+static inline size_t _calc_rec_len_dtr(stdf_attribute_unused stdf_file *f, stdf_rec_dtr *r)
{
return _lenCn(r->TEXT_DAT);
}
Modified: trunk/libstdf/src/rec.h
===================================================================
--- trunk/libstdf/src/rec.h 2007-02-18 16:28:05 UTC (rev 281)
+++ trunk/libstdf/src/rec.h 2007-02-19 03:36:34 UTC (rev 282)
@@ -14,79 +14,79 @@
#include <libstdf.h>
-extern stdf_rec_unknown* stdf_read_rec_unknown(stdf_file*) attribute_hidden;
-extern stdf_rec_far* stdf_read_rec_far(stdf_file*) attribute_hidden;
-extern stdf_rec_atr* stdf_read_rec_atr(stdf_file*) attribute_hidden;
-extern stdf_rec_mir* stdf_read_rec_mir(stdf_file*) attribute_hidden;
-extern stdf_rec_mrr* stdf_read_rec_mrr(stdf_file*) attribute_hidden;
-extern stdf_rec_pcr* stdf_read_rec_pcr(stdf_file*) attribute_hidden;
-extern stdf_rec_hbr* stdf_read_rec_hbr(stdf_file*) attribute_hidden;
-extern stdf_rec_sbr* stdf_read_rec_sbr(stdf_file*) attribute_hidden;
-extern stdf_rec_pmr* stdf_read_rec_pmr(stdf_file*) attribute_hidden;
-extern stdf_rec_pgr* stdf_read_rec_pgr(stdf_file*) attribute_hidden;
-extern stdf_rec_plr* stdf_read_rec_plr(stdf_file*) attribute_hidden;
-extern stdf_rec_rdr* stdf_read_rec_rdr(stdf_file*) attribute_hidden;
-extern stdf_rec_sdr* stdf_read_rec_sdr(stdf_file*) attribute_hidden;
-extern stdf_rec_wir* stdf_read_rec_wir(stdf_file*) attribute_hidden;
-extern stdf_rec_wrr* stdf_read_rec_wrr(stdf_file*) attribute_hidden;
-extern stdf_rec_wcr* stdf_read_rec_wcr(stdf_file*) attribute_hidden;
-extern stdf_rec_pir* stdf_read_rec_pir(stdf_file*) attribute_hidden;
-extern stdf_rec_prr* stdf_read_rec_prr(stdf_file*) attribute_hidden;
+extern stdf_rec_unknown* stdf_read_rec_unknown(stdf_file*) stdf_attribute_hidden;
+extern stdf_rec_far* stdf_read_rec_far(stdf_file*) stdf_attribute_hidden;
+extern stdf_rec_atr* stdf_read_rec_atr(stdf_file*) stdf_attribute_hidden;
+extern stdf_rec_mir* stdf_read_rec_mir(stdf_file*) stdf_attribute_hidden;
+extern stdf_rec_mrr* stdf_read_rec_mrr(stdf_file*) stdf_attribute_hidden;
+extern stdf_rec_pcr* stdf_read_rec_pcr(stdf_file*) stdf_attribute_hidden;
+extern stdf_rec_hbr* stdf_read_rec_hbr(stdf_file*) stdf_attribute_hidden;
+extern stdf_rec_sbr* stdf_read_rec_sbr(stdf_file*) stdf_attribute_hidden;
+extern stdf_rec_pmr* stdf_read_rec_pmr(stdf_file*) stdf_attribute_hidden;
+extern stdf_rec_pgr* stdf_read_rec_pgr(stdf_file*) stdf_attribute_hidden;
+extern stdf_rec_plr* stdf_read_rec_plr(stdf_file*) stdf_attribute_hidden;
+extern stdf_rec_rdr* stdf_read_rec_rdr(stdf_file*) stdf_attribute_hidden;
+extern stdf_rec_sdr* stdf_read_rec_sdr(stdf_file*) stdf_attribute_hidden;
+extern stdf_rec_wir* stdf_read_rec_wir(stdf_file*) stdf_attribute_hidden;
+extern stdf_rec_wrr* stdf_read_rec_wrr(stdf_file*) stdf_attribute_hidden;
+extern stdf_rec_wcr* stdf_read_rec_wcr(stdf_file*) stdf_attribute_hidden;
+extern stdf_rec_pir* stdf_read_rec_pir(stdf_file*) stdf_attribute_hidden;
+extern stdf_rec_prr* stdf_read_rec_prr(stdf_file*) stdf_attribute_hidden;
#ifdef STDF_VER3
-extern stdf_rec_pdr* stdf_read_rec_pdr(stdf_file*) attribute_hidden;
-extern stdf_rec_fdr* stdf_read_rec_fdr(stdf_file*) attribute_hidden;
+extern stdf_rec_pdr* stdf_read_rec_pdr(stdf_file*) stdf_attribute_hidden;
+extern stdf_rec_fdr* stdf_read_rec_fdr(stdf_file*) stdf_attribute_hidden;
#endif
-extern stdf_rec_tsr* stdf_read_rec_tsr(stdf_file*) attribute_hidden;
-extern stdf_rec_ptr* stdf_read_rec_ptr(stdf_file*) attribute_hidden;
-extern stdf_rec_mpr* stdf_read_rec_mpr(stdf_file*) attribute_hidden;
-extern stdf_rec_ftr* stdf_read_rec_ftr(stdf_file*) attribute_hidden;
-extern stdf_rec_bps* stdf_read_rec_bps(stdf_file*) attribute_hidden;
-extern stdf_rec_eps* stdf_read_rec_eps(stdf_file*) attribute_hidden;
+extern stdf_rec_tsr* stdf_read_rec_tsr(stdf_file*) stdf_attribute_hidden;
+extern stdf_rec_ptr* stdf_read_rec_ptr(stdf_file*) stdf_attribute_hidden;
+extern stdf_rec_mpr* stdf_read_rec_mpr(stdf_file*) stdf_attribute_hidden;
+extern stdf_rec_ftr* stdf_read_rec_ftr(stdf_file*) stdf_attribute_hidden;
+extern stdf_rec_bps* stdf_read_rec_bps(stdf_file*) stdf_attribute_hidden;
+extern stdf_rec_eps* stdf_read_rec_eps(stdf_file*) stdf_attribute_hidden;
#ifdef STDF_VER3
-extern stdf_rec_shb* stdf_read_rec_shb(stdf_file*) attribute_hidden;
-extern stdf_rec_ssb* stdf_read_rec_ssb(stdf_file*) attribute_hidden;
-extern stdf_rec_sts* stdf_read_rec_sts(stdf_file*) attribute_hidden;
-extern stdf_rec_scr* stdf_read_rec_scr(stdf_file*) attribute_hidden;
+extern stdf_rec_shb* stdf_read_rec_shb(stdf_file*) stdf_attribute_hidden;
+extern stdf_rec_ssb* stdf_read_rec_ssb(stdf_file*) stdf_attribute_hidden;
+extern stdf_rec_sts* stdf_read_rec_sts(stdf_file*) stdf_attribute_hidden;
+extern stdf_rec_scr* stdf_read_rec_scr(stdf_file*) stdf_attribute_hidden;
#endif
-extern stdf_rec_gdr* stdf_read_rec_gdr(stdf_file*) attribute_hidden;
-extern stdf_rec_dtr* stdf_read_rec_dtr(stdf_file*) attribute_hidden;
+extern stdf_rec_gdr* stdf_read_rec_gdr(stdf_file*) stdf_attribute_hidden;
+extern stdf_rec_dtr* stdf_read_rec_dtr(stdf_file*) stdf_attribute_hidden;
-extern ssize_t stdf_write_rec_far(stdf_file*, stdf_rec_far*) attribute_hidden;
-extern ssize_t stdf_write_rec_atr(stdf_file*, stdf_rec_atr*) attribute_hidden;
-extern ssize_t stdf_write_rec_mir(stdf_file*, stdf_rec_mir*) attribute_hidden;
-extern ssize_t stdf_write_rec_mrr(stdf_file*, stdf_rec_mrr*) attribute_hidden;
-extern ssize_t stdf_write_rec_pcr(stdf_file*, stdf_rec_pcr*) attribute_hidden;
-extern ssize_t stdf_write_rec_hbr(stdf_file*, stdf_rec_hbr*) attribute_hidden;
-extern ssize_t stdf_write_rec_sbr(stdf_file*, stdf_rec_sbr*) attribute_hidden;
-extern ssize_t stdf_write_rec_pmr(stdf_file*, stdf_rec_pmr*) attribute_hidden;
-extern ssize_t stdf_write_rec_pgr(stdf_file*, stdf_rec_pgr*) attribute_hidden;
-extern ssize_t stdf_write_rec_plr(stdf_file*, stdf_rec_plr*) attribute_hidden;
-extern ssize_t stdf_write_rec_rdr(stdf_file*, stdf_rec_rdr*) attribute_hidden;
-extern ssize_t stdf_write_rec_sdr(stdf_file*, stdf_rec_sdr*) attribute_hidden;
-extern ssize_t stdf_write_rec_wir(stdf_file*, stdf_rec_wir*) attribute_hidden;
-extern ssize_t stdf_write_rec_wrr(stdf_file*, stdf_rec_wrr*) attribute_hidden;
-extern ssize_t stdf_write_rec_wcr(stdf_file*, stdf_rec_wcr*) attribute_hidden;
-extern ssize_t stdf_write_rec_pir(stdf_file*, stdf_rec_pir*) attribute_hidden;
-extern ssize_t stdf_write_rec_prr(stdf_file*, stdf_rec_prr*) attribute_hidden;
+extern ssize_t stdf_write_rec_far(stdf_file*, stdf_rec_far*) stdf_attribute_hidden;
+extern ssize_t stdf_write_rec_atr(stdf_file*, stdf_rec_atr*) stdf_attribute_hidden;
+extern ssize_t stdf_write_rec_mir(stdf_file*, stdf_rec_mir*) stdf_attribute_hidden;
+extern ssize_t stdf_write_rec_mrr(stdf_file*, stdf_rec_mrr*) stdf_attribute_hidden;
+extern ssize_t stdf_write_rec_pcr(stdf_file*, stdf_rec_pcr*) stdf_attribute_hidden;
+extern ssize_t stdf_write_rec_hbr(stdf_file*, stdf_rec_hbr*) stdf_attribute_hidden;
+extern ssize_t stdf_write_rec_sbr(stdf_file*, stdf_rec_sbr*) stdf_attribute_hidden;
+extern ssize_t stdf_write_rec_pmr(stdf_file*, stdf_rec_pmr*) stdf_attribute_hidden;
+extern ssize_t stdf_write_rec_pgr(stdf_file*, stdf_rec_pgr*) stdf_attribute_hidden;
+extern ssize_t stdf_write_rec_plr(stdf_file*, stdf_rec_plr*) stdf_attribute_hidden;
+extern ssize_t stdf_write_rec_rdr(stdf_file*, stdf_rec_rdr*) stdf_attribute_hidden;
+extern ssize_t stdf_write_rec_sdr(stdf_file*, stdf_rec_sdr*) stdf_attribute_hidden;
+extern ssize_t stdf_write_rec_wir(stdf_file*, stdf_rec_wir*) stdf_attribute_hidden;
+extern ssize_t stdf_write_rec_wrr(stdf_file*, stdf_rec_wrr*) stdf_attribute_hidden;
+extern ssize_t stdf_write_rec_wcr(stdf_file*, stdf_rec_wcr*) stdf_attribute_hidden;
+extern ssize_t stdf_write_rec_pir(stdf_file*, stdf_rec_pir*) stdf_attribute_hidden;
+extern ssize_t stdf_write_rec_prr(stdf_file*, stdf_rec_prr*) stdf_attribute_hidden;
#ifdef STDF_VER3
-extern ssize_t stdf_write_rec_pdr(stdf_file*, stdf_rec_pdr*) attribute_hidden;
-extern ssize_t stdf_write_rec_fdr(stdf_file*, stdf_rec_fdr*) attribute_hidden;
+extern ssize_t stdf_write_rec_pdr(stdf_file*, stdf_rec_pdr*) stdf_attribute_hidden;
+extern ssize_t stdf_write_rec_fdr(stdf_file*, stdf_rec_fdr*) stdf_attribute_hidden;
#endif
-extern ssize_t stdf_write_rec_tsr(stdf_file*, stdf_rec_tsr*) attribute_hidden;
-extern ssize_t stdf_write_rec_ptr(stdf_file*, stdf_rec_ptr*) attribute_hidden;
-extern ssize_t stdf_write_rec_mpr(stdf_file*, stdf_rec_mpr*) attribute_hidden;
-extern ssize_t stdf_write_rec_ftr(stdf_file*, stdf_rec_ftr*) attribute_hidden;
-extern ssize_t stdf_write_rec_bps(stdf_file*, stdf_rec_bps*) attribute_hidden;
-extern ssize_t stdf_write_rec_eps(stdf_file*, stdf_rec_eps*) attribute_hidden;
+extern ssize_t stdf_write_rec_tsr(stdf_file*, stdf_rec_tsr*) stdf_attribute_hidden;
+extern ssize_t stdf_write_rec_ptr(stdf_file*, stdf_rec_ptr*) stdf_attribute_hidden;
+extern ssize_t stdf_write_rec_mpr(stdf_file*, stdf_rec_mpr*) stdf_attribute_hidden;
+extern ssize_t stdf_write_rec_ftr(stdf_file*, stdf_rec_ftr*) stdf_attribute_hidden;
+extern ssize_t stdf_write_rec_bps(stdf_file*, stdf_rec_bps*) stdf_attribute_hidden;
+extern ssize_t stdf_write_rec_eps(stdf_file*, stdf_rec_eps*) stdf_attribute_hidden;
#ifdef STDF_VER3
-extern ssize_t stdf_write_rec_shb(stdf_file*, stdf_rec_shb*) attribute_hidden;
-extern ssize_t stdf_write_rec_ssb(stdf_file*, stdf_rec_ssb*) attribute_hidden;
-extern ssize_t stdf_write_rec_sts(stdf_file*, stdf_rec_sts*) attribute_hidden;
-extern ssize_t stdf_write_rec_scr(stdf_file*, stdf_rec_scr*) attribute_hidden;
+extern ssize_t stdf_write_rec_shb(stdf_file*, stdf_rec_shb*) stdf_attribute_hidden;
+extern ssize_t stdf_write_rec_ssb(stdf_file*, stdf_rec_ssb*) stdf_attribute_hidden;
+extern ssize_t stdf_write_rec_sts(stdf_file*, stdf_rec_sts*) stdf_attribute_hidden;
+extern ssize_t stdf_write_rec_scr(stdf_file*, stdf_rec_scr*) stdf_attribute_hidden;
#endif
-extern ssize_t stdf_write_rec_gdr(stdf_file*, stdf_rec_gdr*) attribute_hidden;
-extern ssize_t stdf_write_rec_dtr(stdf_file*, stdf_rec_dtr*) attribute_hidden;
+extern ssize_t stdf_write_rec_gdr(stdf_file*, stdf_rec_gdr*) stdf_attribute_hidden;
+extern ssize_t stdf_write_rec_dtr(stdf_file*, stdf_rec_dtr*) stdf_attribute_hidden;
-ssize_t _stdf_write_flush(stdf_file*, size_t) attribute_hidden;
+ssize_t _stdf_write_flush(stdf_file*, size_t) stdf_attribute_hidden;
#endif /* _LIBSTDF_REC_H */
Added: trunk/m4/stdf_gcc_attributes.m4
===================================================================
--- trunk/m4/stdf_gcc_attributes.m4 (rev 0)
+++ trunk/m4/stdf_gcc_attributes.m4 2007-02-19 03:36:34 UTC (rev 282)
@@ -0,0 +1,37 @@
+dnl
+dnl AC_STDF_GCC_ATTR_CHECK(define suffix, checking display, compile global, compile body)
+dnl
+AC_DEFUN([AC_STDF_GCC_ATTR_CHECK],
+[dnl
+ AC_MSG_CHECKING(if the compiler supports __attribute__ (( [$2] )) )
+ AC_TRY_COMPILE([$3], [$4], [stdf_gcc_attr="1"], [stdf_gcc_attr="0"])
+ AC_DEFINE_UNQUOTED(STDF_HAVE_GCC_ATTRIBUTE_$1, $stdf_gcc_attr, [compiler supports __attribute__ (($1))])
+ test $stdf_gcc_attr = 1 && stdf_gcc_attr="yes" || stdf_gcc_attr="no"
+ AC_MSG_RESULT($stdf_gcc_attr)
+])
+AC_DEFUN([AC_STDF_GCC_ATTRIBUTES],
+[dnl
+dnl ********************************************************
+dnl * gcc attributes *
+dnl ********************************************************
+AC_STDF_GCC_ATTR_CHECK([UNUSED],
+ [__unused__],
+ [],
+ [int i __attribute__ ((__unused__))])
+AC_STDF_GCC_ATTR_CHECK([CONST],
+ [__const__],
+ [__attribute__((__const__)) void stdf_foo_moo(void) {}],
+ [])
+AC_STDF_GCC_ATTR_CHECK([VISIBILITY],
+ [__visibility__("hidden")],
+ [__attribute__((__visibility__("hidden"))) void stdf_foo_moo(void) {}],
+ [])
+AC_STDF_GCC_ATTR_CHECK([STRONG_ALIAS],
+ [__alias__("symbol")],
+ [int stdf_foo(void) {} extern int stdf_moo(void) __attribute__ (( __alias__ ("stdf_foo")));],
+ [int i = stdf_moo();])
+AC_STDF_GCC_ATTR_CHECK([WEAK_ALIAS],
+ [__weak__, __alias__("symbol")],
+ [int stdf_foo(void) {} extern int stdf_moo(void) __attribute__ (( __weak__, __alias__ ("stdf_foo")));],
+ [int i = stdf_moo();])
+])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <va...@us...> - 2007-02-20 15:48:45
|
Revision: 288
http://svn.sourceforge.net/freestdf/?rev=288&view=rev
Author: vapier
Date: 2007-02-20 07:45:51 -0800 (Tue, 20 Feb 2007)
Log Message:
-----------
cleanup mingw handling so we can compile like normal via configure (--host=mingw32)
Modified Paths:
--------------
trunk/libstdf/configure.ac
trunk/libstdf/examples/record_stats.c
trunk/libstdf/include/libstdf_systems.h
trunk/libstdf/include/libstdf_win32.h
trunk/libstdf/src/Makefile.am
trunk/libstdf/tests/Makefile.in
trunk/m4/stdf_gcc_attributes.m4
trunk/m4/stdf_libtool.m4
Property Changed:
----------------
trunk/libstdf/examples/
Modified: trunk/libstdf/configure.ac
===================================================================
--- trunk/libstdf/configure.ac 2007-02-19 05:00:45 UTC (rev 287)
+++ trunk/libstdf/configure.ac 2007-02-20 15:45:51 UTC (rev 288)
@@ -11,7 +11,7 @@
stdint.h inttypes.h sys/types.h sys/stat.h ctype.h \
errno.h unistd.h fcntl.h stdio.h stdlib.h time.h \
string.h endian.h sys/endian.h machine/endian.h \
-cmplrs/host.h sys/isa_defs.h byteswap.h \
+cmplrs/host.h sys/isa_defs.h byteswap.h sys/param.h \
features.h stdarg.h sys/cdefs.h assert.h \
])
Property changes on: trunk/libstdf/examples
___________________________________________________________________
Name: svn:ignore
- *~
*.o
*.lo
.deps
.libs
Makefile
Makefile.in
dump_records_to_ascii
dump_records_to_html
example
extract_records
is_valid_stdf
makestdf
record_stats
stdf2img
stdf2xtdf
+ *~
*.o
*.lo
.deps
.libs
*.exe
Makefile
Makefile.in
dump_records_to_ascii
dump_records_to_html
example
extract_records
is_valid_stdf
makestdf
record_stats
stdf2img
stdf2xtdf
Modified: trunk/libstdf/examples/record_stats.c
===================================================================
--- trunk/libstdf/examples/record_stats.c 2007-02-19 05:00:45 UTC (rev 287)
+++ trunk/libstdf/examples/record_stats.c 2007-02-20 15:45:51 UTC (rev 288)
@@ -12,7 +12,7 @@
/*
* libhash
*/
-#if HAVE_HASH_H
+#if defined(HAVE_HASH_H)
#include <hash.h>
#define HASH_VARS \
void *key, *val; \
@@ -41,7 +41,7 @@
/*
* Ecore
*/
-#elif HAVE_ECORE
+#elif defined(HAVE_ECORE)
#include <Ecore.h>
#define HASH_VARS \
Ecore_Hash *hash_table; \
@@ -68,7 +68,7 @@
/*
* glib
*/
-#elif HAVE_GLIB
+#elif defined(HAVE_GLIB)
#include <glib.h>
#define HASH_VARS \
GHashTable *hash_table; \
Modified: trunk/libstdf/include/libstdf_systems.h
===================================================================
--- trunk/libstdf/include/libstdf_systems.h 2007-02-19 05:00:45 UTC (rev 287)
+++ trunk/libstdf/include/libstdf_systems.h 2007-02-20 15:45:51 UTC (rev 288)
@@ -11,7 +11,7 @@
#ifndef _LIBSTDF_SYSTEMS_H
#define _LIBSTDF_SYSTEMS_H
-#ifdef WIN32
+#if defined(WIN32) && !defined(__MINGW32__)
# include <libstdf_win32.h>
#else
# include <libstdf_sys_config.h>
@@ -80,6 +80,9 @@
#if defined(HAVE_SYS_ISA_DEFS_H)
# include <sys/isa_defs.h>
#endif
+#if defined(HAVE_SYS_PARAM_H)
+# include <sys/param.h>
+#endif
#if defined(HAVE_BYTESWAP_H)
# include <byteswap.h>
Modified: trunk/libstdf/include/libstdf_win32.h
===================================================================
--- trunk/libstdf/include/libstdf_win32.h 2007-02-19 05:00:45 UTC (rev 287)
+++ trunk/libstdf/include/libstdf_win32.h 2007-02-20 15:45:51 UTC (rev 288)
@@ -15,7 +15,6 @@
#include <sys/types.h>
-#if !defined(__MINGW_H)
typedef unsigned __int8 uint8_t;
typedef unsigned __int16 uint16_t;
typedef unsigned __int32 uint32_t;
@@ -24,7 +23,6 @@
typedef signed __int16 int16_t;
typedef signed __int32 int32_t;
typedef signed __int64 int64_t;
-#endif
#ifndef PACKAGE_STRING
# ifndef __DATE__
Modified: trunk/libstdf/src/Makefile.am
===================================================================
--- trunk/libstdf/src/Makefile.am 2007-02-19 05:00:45 UTC (rev 287)
+++ trunk/libstdf/src/Makefile.am 2007-02-20 15:45:51 UTC (rev 288)
@@ -19,6 +19,6 @@
rec.c \
$(EXTRA_STDF_SOURCES)
libstdf_la_CFLAGS = -no-suppress
-libstdf_la_LDFLAGS = -no-suppress -version-info 0:1:0
+libstdf_la_LDFLAGS = -no-suppress -version-info 0:1:0 -no-undefined
libstdf_la_LIBADD = @ZIP_LIBS@ @GZIP_LIBS@ @BZIP2_LIBS@ @DEBUG_LIBS@
Modified: trunk/libstdf/tests/Makefile.in
===================================================================
--- trunk/libstdf/tests/Makefile.in 2007-02-19 05:00:45 UTC (rev 287)
+++ trunk/libstdf/tests/Makefile.in 2007-02-20 15:45:51 UTC (rev 288)
@@ -4,6 +4,7 @@
top_srcdir = @top_srcdir@
builddir = @builddir@
top_builddir = @top_builddir@
+EXEEXT = @EXEEXT@
EXAMPLE_DIR = $(top_builddir)/examples
STDF = stdf.bz2
@@ -17,19 +18,19 @@
cp $(srcdir)/$(STDF) $(STDF)
ascii: $(STDF)
- $(EXAMPLE_DIR)/dump_records_to_ascii $(STDF) > ascii.out
+ $(EXAMPLE_DIR)/dump_records_to_ascii$(EXEEXT) $(STDF) > ascii.out
$(BZCMP) ascii.out $(srcdir)/ascii.good.bz2
html: $(STDF)
- $(EXAMPLE_DIR)/dump_records_to_html $(STDF) html.out
+ $(EXAMPLE_DIR)/dump_records_to_html$(EXEEXT) $(STDF) html.out
$(BZCMP) html.out $(srcdir)/html.good.bz2
stats: $(STDF)
- $(EXAMPLE_DIR)/record_stats $(STDF) | env LC_ALL="C" sort > stats.out
+ $(EXAMPLE_DIR)/record_stats$(EXEEXT) $(STDF) | env LC_ALL="C" sort > stats.out
$(BZCMP) stats.out $(srcdir)/stats.good.bz2
create:
- $(EXAMPLE_DIR)/makestdf create.out
+ $(EXAMPLE_DIR)/makestdf$(EXEEXT) create.out
$(BZCMP) create.out $(srcdir)/create.good.bz2
distdir:
Modified: trunk/m4/stdf_gcc_attributes.m4
===================================================================
--- trunk/m4/stdf_gcc_attributes.m4 2007-02-19 05:00:45 UTC (rev 287)
+++ trunk/m4/stdf_gcc_attributes.m4 2007-02-20 15:45:51 UTC (rev 288)
@@ -2,11 +2,15 @@
dnl AC_STDF_GCC_ATTR_CHECK(define suffix, checking display, compile global, compile body)
dnl
AC_DEFUN([AC_STDF_GCC_ATTR_CHECK],
-[dnl
+[dnl The usage of -Werror is catch things where gcc will simply warn about the attribute not being supported
AC_MSG_CHECKING(if the compiler supports __attribute__ (( [$2] )) )
- AC_TRY_COMPILE([$3], [$4], [stdf_gcc_attr="1"], [stdf_gcc_attr="0"])
- AC_DEFINE_UNQUOTED(STDF_HAVE_GCC_ATTRIBUTE_$1, $stdf_gcc_attr, [compiler supports __attribute__ (($1))])
- test $stdf_gcc_attr = 1 && stdf_gcc_attr="yes" || stdf_gcc_attr="no"
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -Wattributes -Werror"
+ AC_TRY_COMPILE([$3], [$4], [stdf_gcc_attr="yes"], [stdf_gcc_attr="no"])
+ if test x"$stdf_gcc_attr" = xyes ; then
+ AC_DEFINE(STDF_HAVE_GCC_ATTRIBUTE_$1, 1, [compiler supports __attribute__ (($1))])
+ fi
+ CFLAGS="$save_CFLAGS"
AC_MSG_RESULT($stdf_gcc_attr)
])
AC_DEFUN([AC_STDF_GCC_ATTRIBUTES],
Modified: trunk/m4/stdf_libtool.m4
===================================================================
--- trunk/m4/stdf_libtool.m4 2007-02-19 05:00:45 UTC (rev 287)
+++ trunk/m4/stdf_libtool.m4 2007-02-20 15:45:51 UTC (rev 288)
@@ -5,6 +5,7 @@
m4_defun([AC_PROG_CXX],[])
m4_undefine([AC_PROG_F77])
m4_defun([AC_PROG_F77],[])
+AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
AC_ENABLE_SHARED
AC_ENABLE_STATIC
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <va...@us...> - 2007-11-26 14:14:28
|
Revision: 297
http://freestdf.svn.sourceforge.net/freestdf/?rev=297&view=rev
Author: vapier
Date: 2007-11-26 06:14:31 -0800 (Mon, 26 Nov 2007)
Log Message:
-----------
split common testsuite code out
Modified Paths:
--------------
trunk/liblzw/autogen.sh
trunk/liblzw/tests/local.at
trunk/liblzw/tests/testsuite.at
Added Paths:
-----------
trunk/m4/stdf_bzcheck.at
Property Changed:
----------------
trunk/liblzw/tests/
Modified: trunk/liblzw/autogen.sh
===================================================================
--- trunk/liblzw/autogen.sh 2007-11-26 07:25:40 UTC (rev 296)
+++ trunk/liblzw/autogen.sh 2007-11-26 14:14:31 UTC (rev 297)
@@ -5,6 +5,7 @@
rm -rf m4
mkdir -p m4
cp ../m4/*.m4 m4/
+ cp ../m4/*.at tests/
fi
fi
Property changes on: trunk/liblzw/tests
___________________________________________________________________
Name: svn:ignore
- *~
*.o
*.lo
.deps
.libs
atconfig
Makefile
Makefile.in
package.m4
testsuite
testsuite.dir
testsuite.log
lot
simple
simple2
+ *~
*.o
*.lo
.deps
.libs
atconfig
Makefile
Makefile.in
package.m4
stdf_bzcheck.at
testsuite
testsuite.dir
testsuite.log
lot
simple
simple2
Modified: trunk/liblzw/tests/local.at
===================================================================
--- trunk/liblzw/tests/local.at 2007-11-26 07:25:40 UTC (rev 296)
+++ trunk/liblzw/tests/local.at 2007-11-26 14:14:31 UTC (rev 297)
@@ -1,16 +1 @@
-dnl these suckers create megs of output which autotest
-dnl cant handle so do bzcmp ourselves
-m4_defun([AT_LZW_QUICK_BZCHECK],[
-
-AT_SETUP([$1])
-
-AT_CHECK([
-"$[]builddir/$1" "$[]top_srcdir/tests/$1.Z" > $1.out
-ret=$[]?
-bzdiff -u "$[]top_srcdir/tests/$1.good.bz2" $1.out
-(exit $[]ret)
-],[0])
-
-AT_CLEANUP
-
-])
+m4_include(stdf_bzcheck.at)
Modified: trunk/liblzw/tests/testsuite.at
===================================================================
--- trunk/liblzw/tests/testsuite.at 2007-11-26 07:25:40 UTC (rev 296)
+++ trunk/liblzw/tests/testsuite.at 2007-11-26 14:14:31 UTC (rev 297)
@@ -1,5 +1,5 @@
AT_INIT
-AT_LZW_QUICK_BZCHECK([lot])
-AT_LZW_QUICK_BZCHECK([simple])
-AT_LZW_QUICK_BZCHECK([simple2])
+AT_QUICK_BZCHECK([lot])
+AT_QUICK_BZCHECK([simple])
+AT_QUICK_BZCHECK([simple2])
Added: trunk/m4/stdf_bzcheck.at
===================================================================
--- trunk/m4/stdf_bzcheck.at (rev 0)
+++ trunk/m4/stdf_bzcheck.at 2007-11-26 14:14:31 UTC (rev 297)
@@ -0,0 +1,16 @@
+dnl these suckers create megs of output which autotest
+dnl cant handle so do bzcmp ourselves
+m4_defun([AT_QUICK_BZCHECK],[
+
+AT_SETUP([$1])
+
+AT_CHECK([
+"$[]builddir/$1" "$[]top_srcdir/tests/$1.Z" > $1.out
+ret=$[]?
+bzdiff -u "$[]top_srcdir/tests/$1.good.bz2" $1.out
+(exit $[]ret)
+],[0])
+
+AT_CLEANUP
+
+])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <va...@us...> - 2007-11-26 15:57:43
|
Revision: 300
http://freestdf.svn.sourceforge.net/freestdf/?rev=300&view=rev
Author: vapier
Date: 2007-11-26 07:55:33 -0800 (Mon, 26 Nov 2007)
Log Message:
-----------
drop untested warnings since all recs should (in theory) be tested
Modified Paths:
--------------
trunk/libstdf/src/rec.c
trunk/m4/stdf_vapier_dev.m4
Modified: trunk/libstdf/src/rec.c
===================================================================
--- trunk/libstdf/src/rec.c 2007-11-26 15:54:11 UTC (rev 299)
+++ trunk/libstdf/src/rec.c 2007-11-26 15:55:33 UTC (rev 300)
@@ -94,22 +94,7 @@
return stdf_rec_names[_stdf_header_to_idx(type, sub)];
}
-#ifdef WARN_UNTESTED
-#define warn_untested(type) \
- do { \
- warnf("*********************************************"); \
- warnf("This record type (" type ") has not been tested!"); \
- warnf("Please consider sending this file to"); \
- warnf("va...@gm... to help out the"); \
- warnf("FreeSTDF project and make sure this code"); \
- warnf("works exactly the way it should!"); \
- warnf("*********************************************"); \
- } while (0)
-#else
-#define warn_untested(type)
-#endif
-
/*
* Memory handling functions
*/
@@ -670,7 +655,6 @@
stdf_rec_plr* stdf_read_rec_plr(stdf_file *file)
{
stdf_rec_plr *plr = __malloc_rec(stdf_rec_plr);
- warn_untested("PLR");
_stdf_read_dtc_U2(file, &(plr->GRP_CNT));
_stdf_read_dtc_xU2(file, &(plr->GRP_INDX), plr->GRP_CNT);
_stdf_read_dtc_xU2(file, &(plr->GRP_MODE), plr->GRP_CNT);
@@ -1766,7 +1750,6 @@
ssize_t stdf_write_rec_plr(stdf_file *file, stdf_rec_plr *plr)
{
- warn_untested("PLR");
if (!plr->header.REC_LEN)
SET_HEADER(plr->header, STDF_REC_PLR, _calc_rec_len_plr(file, plr));
_stdf_check_write_buffer(file, plr->header.REC_LEN);
Modified: trunk/m4/stdf_vapier_dev.m4
===================================================================
--- trunk/m4/stdf_vapier_dev.m4 2007-11-26 15:54:11 UTC (rev 299)
+++ trunk/m4/stdf_vapier_dev.m4 2007-11-26 15:55:33 UTC (rev 300)
@@ -1,29 +1,7 @@
AC_DEFUN([AM_STDF_VAPIER_DEV],
[dnl Let's get anal with compiling while on my dev box
-if test "x$HOSTNAME" = "xvapier" ; then
- CFLAGS="$CFLAGS -Wall -Wextra -Wnonnull -Wundef -Werror"
- enable_annoy_untested="no"
-else
- enable_annoy_untested="yes"
-fi
-
-dnl ********************************************************
-dnl * Disable Warnings *
-dnl ********************************************************
-AC_MSG_CHECKING(whether to annoy you about untested code)
-AC_ARG_ENABLE(warn-untested,
- AC_HELP_STRING([--disable-warn-untested],[don't warn about untested code @<:@default=warn@:>@]),
- [
- if test "x$enableval" = "xyes" ; then
- enable_annoy_untested="yes"
- else
- enable_annoy_untested="no"
- fi
- ],
- [enable_annoy_untested="yes"]
-)
-if test "x$enable_annoy_untested" = "xyes" ; then
- AC_DEFINE(WARN_UNTESTED, 1, [Annoy people about unimplemented code])
-fi
-AC_MSG_RESULT($enable_annoy_untested)
+case $HOSTNAME in
+ vapier*) CFLAGS="$CFLAGS -Wall -Wextra -Wnonnull -Wundef -Werror";;
+esac
])
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X