getdata-commits Mailing List for GetData (Page 17)
Scientific Database Format
Brought to you by:
ketiltrout
Menu
▾
▴
getdata-commits — An automated log of GetData Subversion activity.
This list is closed, nobody may subscribe to it.
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(5) |
Oct
(20) |
Nov
(21) |
Dec
(16) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2011 |
Jan
(1) |
Feb
(1) |
Mar
(56) |
Apr
(20) |
May
(4) |
Jun
(2) |
Jul
(3) |
Aug
(11) |
Sep
(2) |
Oct
(4) |
Nov
(18) |
Dec
(16) |
| 2012 |
Jan
(8) |
Feb
(12) |
Mar
(30) |
Apr
(13) |
May
(10) |
Jun
(17) |
Jul
(18) |
Aug
(19) |
Sep
|
Oct
(1) |
Nov
(1) |
Dec
(9) |
| 2013 |
Jan
(1) |
Feb
(4) |
Mar
(27) |
Apr
(6) |
May
(3) |
Jun
(1) |
Jul
(10) |
Aug
|
Sep
(3) |
Oct
(15) |
Nov
(4) |
Dec
(9) |
| 2014 |
Jan
|
Feb
(3) |
Mar
(4) |
Apr
(10) |
May
(15) |
Jun
|
Jul
(14) |
Aug
|
Sep
(2) |
Oct
(6) |
Nov
|
Dec
(9) |
| 2015 |
Jan
(2) |
Feb
(3) |
Mar
(1) |
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <syn...@us...> - 2011-03-22 09:16:40
|
Revision: 535
http://getdata.svn.sourceforge.net/getdata/?rev=535&view=rev
Author: syntheticpp
Date: 2011-03-22 09:16:34 +0000 (Tue, 22 Mar 2011)
Log Message:
-----------
replace forgotten strtoll
Modified Paths:
--------------
branches/getdata-0.7/src/parse.c
Modified: branches/getdata-0.7/src/parse.c
===================================================================
--- branches/getdata-0.7/src/parse.c 2011-03-22 05:08:35 UTC (rev 534)
+++ branches/getdata-0.7/src/parse.c 2011-03-22 09:16:34 UTC (rev 535)
@@ -154,7 +154,7 @@
_GD_InternalError(D);
} else if (type & GD_SIGNED) {
/* try to convert to long long int */
- long long int lli = strtoll(token, &ptr, 10);
+ long long int lli = gd_strtoull(token, &ptr, 10);
/* there were trailing characters in the long long int */
if (*ptr != '\0') {
@@ -1738,7 +1738,7 @@
#endif
}
} else if (strcmp(ptr, "FRAMEOFFSET") == 0 && (!pedantic || *standards >= 1))
- D->fragment[me].frame_offset = strtoll(in_cols[1], NULL, 10);
+ D->fragment[me].frame_offset = gd_strtoull(in_cols[1], NULL, 10);
else if (strcmp(ptr, "INCLUDE") == 0 && (!pedantic || *standards >= 3)) {
unsigned long subflags = D->fragment[me].encoding | D->fragment[me].byte_sex
| (*flags & (GD_PEDANTIC | GD_PERMISSIVE | GD_FORCE_ENDIAN |
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ket...@us...> - 2011-03-22 05:08:41
|
Revision: 534
http://getdata.svn.sourceforge.net/getdata/?rev=534&view=rev
Author: ketiltrout
Date: 2011-03-22 05:08:35 +0000 (Tue, 22 Mar 2011)
Log Message:
-----------
Preserve CRLF line endings.
Modified Paths:
--------------
branches/getdata-0.7/Makefile.am
Modified: branches/getdata-0.7/Makefile.am
===================================================================
--- branches/getdata-0.7/Makefile.am 2011-03-22 05:01:07 UTC (rev 533)
+++ branches/getdata-0.7/Makefile.am 2011-03-22 05:08:35 UTC (rev 534)
@@ -85,7 +85,7 @@
cp -r bindings/cxx $(distdir)/bindings && \
cp -r cmake src test $(distdir) && \
$(SED) cmake/CMakeLists.txt \
- -e 's/-DPACKAGE_VERSION=.*/-DPACKAGE_VERSION="$(PACKAGE_VERSION)"/' \
+ -e 's/-DPACKAGE_VERSION=\\".*\\"/-DPACKAGE_VERSION=\\"$(PACKAGE_VERSION)\\"/' \
> $(distdir)/cmake/CMakeLists.txt && \
cp -r doc/README.cxx doc/unclean_database_recovery.txt $(distdir)/doc && \
cp AUTHORS COPYING COPYING.DOC ChangeLog NEWS TODO $(distdir) && \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ket...@us...> - 2011-03-22 05:01:17
|
Revision: 533
http://getdata.svn.sourceforge.net/getdata/?rev=533&view=rev
Author: ketiltrout
Date: 2011-03-22 05:01:07 +0000 (Tue, 22 Mar 2011)
Log Message:
-----------
README for MSVC package.
Modified Paths:
--------------
branches/getdata-0.7/Makefile.am
Added Paths:
-----------
branches/getdata-0.7/README.win
Modified: branches/getdata-0.7/Makefile.am
===================================================================
--- branches/getdata-0.7/Makefile.am 2011-03-22 04:11:57 UTC (rev 532)
+++ branches/getdata-0.7/Makefile.am 2011-03-22 05:01:07 UTC (rev 533)
@@ -89,7 +89,7 @@
> $(distdir)/cmake/CMakeLists.txt && \
cp -r doc/README.cxx doc/unclean_database_recovery.txt $(distdir)/doc && \
cp AUTHORS COPYING COPYING.DOC ChangeLog NEWS TODO $(distdir) && \
- cp README $(distdir)/README && \
+ cp README.win $(distdir)/README && \
rm -f $(distdir)/*/Makefile.am $(distdir)/*/*/Makefile.am && \
zip -rq getdata_win-$(PACKAGE_VERSION).zip $(distdir) && \
cp getdata_win*.zip .. \
Added: branches/getdata-0.7/README.win
===================================================================
--- branches/getdata-0.7/README.win (rev 0)
+++ branches/getdata-0.7/README.win 2011-03-22 05:01:07 UTC (rev 533)
@@ -0,0 +1,166 @@
+THE GETDATA PROJECT
+===================
+
+The GetData Project is the reference implementation of the Dirfile Standards.
+The Dirfile database format is designed to provide a fast, simple format for
+storing and reading binary time-ordered data. The Dirfile Standards are
+described in detail in three Unix manual pages distributed with this package:
+dirfile(5), dirfile-format(5) and dirfile-encoding(5), which may be read before
+installation by running:
+
+ $ man man/dirfile.5
+ $ man man/dirfile-format.5
+ $ man man/dirfile-encoding.5
+
+from the top GetData Project directory (the directory containing this README
+file). After installation, they can be read with the standard man command:
+
+ $ man dirfile
+ $ man dirfile-format
+ $ man dirfile-encoding
+
+More information on the GetData Project and the Dirfile database format may be
+found on the World Wide Web:
+
+ http://getdata.sourceforge.net/
+
+
+WARRANTY AND REDISTRIBUTION
+===========================
+
+GetData 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.1 of the License, or (at your option) any later
+version.
+
+GetData is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with GetData in a file called `COPYING'; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+
+CONTENTS
+========
+
+This package provides:
+ * the Dirfile Standards documents (three Unix manual pages in HTML)
+ * the C GetData library (libgetdata) including HTMLised Unix manual pages
+ * bindings to the library from C++ (libgetdata++)
+
+Documentation for the various bindings, if present, can be found in files
+named `README.<language>' in the doc/ directory. The C interface is described
+in this document and the associated man pages.
+
+A full list of features new to this release of GetData may be found in the
+file called `NEWS'.
+
+This package only provides a subset of the functionality of the full GetData
+source code release, and is designed to be built on Microsoft Windows using
+Microsoft Corporation's Visual C++ compiler, or else the open source MinGW
+compiler. Notably missing in this package are bindings for Fortran, Python,
+and the Interactive Data Language, the binary utilities (checkdirfile and
+dirfile2ascii), support for external data encodings (compressed dirfiles),
+and the C Library's C99 and Legacy APIs.
+
+The full GetData source code release, which cannot be built (easily) by Visual
+C++ (but can be built using MinGW, if the associated MSys shell is used) is
+available from the World Wide Web; for details see:
+
+ http://getdata.sourceforge.net/
+
+
+
+DIRFILE STANDARDS VERSION 8
+===========================
+
+The 0.7.0 release of the GetData Library (October 2010), was released in
+conjunction with a new version of the Dirfile Standards, known as Standards
+Version 8.
+
+Standards Version 8 introduces the following:
+ * Two new field types: DIVIDE, the quotient of two input vector fields,
+ and RECIP, the reciprocal of a vector field.
+ * Support for middle-endian ARM double-precision floating point data.
+ * Furthermore, several deprecated features have been removed. The old single
+ character type names are no longer accepted, and directives now require an
+ initial forward slash. (NB: these features are only removed from Standards
+ Version 8; GetData, which understands all Standards Versions, still can work
+ with these features.)
+
+This is the first update to the Dirfile Standards since Standards Version 7
+(October 2009). A full history of the Dirfile Standards can be found in the
+dirfile-format(5) man page.
+
+
+BUILDING THE LIBRARY
+====================
+
+This package may be built using Kitware's CMake build system. Consult the CMake
+documentation for generic instructions on using CMake. A brief summary follows.
+This package supports building GetData using either Microsoft's Visual C++ compiler
+or else the free MinGW compiler, both which produce native Win32 binaries.
+
+To create a project file for Microsoft Visual Studio 10 execute:
+
+ cmake -G"Visual Studio 10" .
+
+from the "cmake" subdirectory of this package. Then build the project as usual.
+The GetData test suite may be run by executing
+
+ cmake . -DGD_TEST=1
+
+which will run a series of self-tests.
+
+
+PREREQUISITES
+=============
+
+The only library required to build GetData is the C Standard Library. Several
+other external will be used if found by ./configure to provide support for
+various data encodings (typically compression schemes). These are:
+
+- the slim compression library by Joseph Fowler;
+- the zlib library by Jean-loup Gailly and Mark Adler;
+- the bzip2 compression library by Julian Seward; and,
+- the lzma library, part of the XZ Utils suite by Lasse Collin, Ville Koskinen,
+ and Igor Pavlov.
+
+If these libraries are not found by configure, GetData will lack support for
+the associated encoding scheme and fail gracefully if encountering dirfiles so
+encoded.
+
+
+USING THE LIBRARY
+=================
+
+To use the library in C programs, the header file getdata.h should be included.
+
+The various small programs in the `util' subdirectory of the package provide
+examples of use.
+
+The checkdirfile utility was designed to report syntax errors in the format
+file(s) of the large, complex dirfiles used in the analysis of the BLAST
+experiment data. This utility will report all syntax errors it find in the
+supplied dirfile, plus any problems in the metadata itself.
+
+Bindings exist for using the GetData library in C++. Documentation for these
+bindings is present in the README.cxx file in the `doc' subdirectory.
+
+Bindings to the GetData library from Fortran, Python, and the Interactive
+Data Language have also been written, but not ported to Microsoft Visual C++.
+If you are interested in these bindings, see the full GetData source release.
+
+
+AUTHOR
+======
+
+The Dirfile Standards and the GetData library were conceived and written by
+C. B. Netterfield <net...@as...>.
+
+Since Standards Version 3 (January 2006), the Dirfile Standards and GetData
+have been maintained by D. V. Wiebe <dv...@ke...>.
+
+A full list of contributors is given in the file called `AUTHORS'.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ket...@us...> - 2011-03-22 04:12:09
|
Revision: 532
http://getdata.svn.sourceforge.net/getdata/?rev=532&view=rev
Author: ketiltrout
Date: 2011-03-22 04:11:57 +0000 (Tue, 22 Mar 2011)
Log Message:
-----------
GetData-0.7.2rc2. Also, a first stab at a MSVC source package. I'm going to
go out on a limb here and guess MS Windows doesn't ship with nroff, so we'll
convert the man pages to html before packaging. And then, since we have them,
why not put them on the web site as well.
Modified Paths:
--------------
branches/getdata-0.7/ChangeLog
branches/getdata-0.7/Makefile.am
branches/getdata-0.7/NEWS
branches/getdata-0.7/m4/version.m4
branches/getdata-0.7/man/Makefile.am
branches/getdata-0.7/man/gd_add.3
branches/getdata-0.7/man/gd_add_bit.3
branches/getdata-0.7/man/gd_add_spec.3
branches/getdata-0.7/man/gd_alter_bit.3
branches/getdata-0.7/man/gd_alter_entry.3
branches/getdata-0.7/man/gd_alter_protection.3
branches/getdata-0.7/man/gd_alter_spec.3
branches/getdata-0.7/man/gd_bof.3
branches/getdata-0.7/man/gd_carray_len.3
branches/getdata-0.7/man/gd_carrays.3
branches/getdata-0.7/man/gd_cbopen.3
branches/getdata-0.7/man/gd_close.3
branches/getdata-0.7/man/gd_constants.3
branches/getdata-0.7/man/gd_delete.3
branches/getdata-0.7/man/gd_dirfile_standards.3
branches/getdata-0.7/man/gd_dirfilename.3
branches/getdata-0.7/man/gd_encoding.3
branches/getdata-0.7/man/gd_endianness.3
branches/getdata-0.7/man/gd_entry.3
branches/getdata-0.7/man/gd_entry_type.3
branches/getdata-0.7/man/gd_eof.3
branches/getdata-0.7/man/gd_field_list.3
branches/getdata-0.7/man/gd_field_list_by_type.3
branches/getdata-0.7/man/gd_flush.3
branches/getdata-0.7/man/gd_fragment_index.3
branches/getdata-0.7/man/gd_fragmentname.3
branches/getdata-0.7/man/gd_framenum_subset.3
branches/getdata-0.7/man/gd_frameoffset.3
branches/getdata-0.7/man/gd_get_carray_slice.3
branches/getdata-0.7/man/gd_get_constant.3
branches/getdata-0.7/man/gd_get_string.3
branches/getdata-0.7/man/gd_getdata.3
branches/getdata-0.7/man/gd_include.3
branches/getdata-0.7/man/gd_madd_bit.3
branches/getdata-0.7/man/gd_mcarrays.3
branches/getdata-0.7/man/gd_mconstants.3
branches/getdata-0.7/man/gd_metaflush.3
branches/getdata-0.7/man/gd_mfield_list.3
branches/getdata-0.7/man/gd_mfield_list_by_type.3
branches/getdata-0.7/man/gd_move.3
branches/getdata-0.7/man/gd_mstrings.3
branches/getdata-0.7/man/gd_mvector_list.3
branches/getdata-0.7/man/gd_native_type.3
branches/getdata-0.7/man/gd_nfields.3
branches/getdata-0.7/man/gd_nfields_by_type.3
branches/getdata-0.7/man/gd_nfragments.3
branches/getdata-0.7/man/gd_nframes.3
branches/getdata-0.7/man/gd_nmfields.3
branches/getdata-0.7/man/gd_nmfields_by_type.3
branches/getdata-0.7/man/gd_nmvectors.3
branches/getdata-0.7/man/gd_nvectors.3
branches/getdata-0.7/man/gd_parent_fragment.3
branches/getdata-0.7/man/gd_protection.3
branches/getdata-0.7/man/gd_put_carray_slice.3
branches/getdata-0.7/man/gd_put_constant.3
branches/getdata-0.7/man/gd_put_string.3
branches/getdata-0.7/man/gd_putdata.3
branches/getdata-0.7/man/gd_raw_filename.3
branches/getdata-0.7/man/gd_reference.3
branches/getdata-0.7/man/gd_rename.3
branches/getdata-0.7/man/gd_rewrite_fragment.3
branches/getdata-0.7/man/gd_spf.3
branches/getdata-0.7/man/gd_strings.3
branches/getdata-0.7/man/gd_uninclude.3
branches/getdata-0.7/man/gd_validate.3
branches/getdata-0.7/man/gd_vector_list.3
trunk/html/Makefile
trunk/html/getdata.css
trunk/html/getdata.html
Property Changed:
----------------
branches/getdata-0.7/man/
trunk/html/
Modified: branches/getdata-0.7/ChangeLog
===================================================================
--- branches/getdata-0.7/ChangeLog 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/ChangeLog 2011-03-22 04:11:57 UTC (rev 532)
@@ -1,3 +1,6 @@
+2011-03-22 D. V. Wiebe <ge...@ke...> svn:532
+ GetData-0.7.2rc2.
+
2011-03-18 D. V. Wiebe <ge...@ke...> svn:529
* m4/python.m4: Added --with-python-module-dir
Modified: branches/getdata-0.7/Makefile.am
===================================================================
--- branches/getdata-0.7/Makefile.am 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/Makefile.am 2011-03-22 04:11:57 UTC (rev 532)
@@ -64,15 +64,49 @@
)
rm -rf idl_getdata
+idldistcheck: idl_$(distdir).tar.gz
+ tar -zxvf $<
+ cd idl_$(distdir) && ./configure && make dist && make distcheck
+ rm -rf idl_$(distdir)
+
+# windows source package
+getdata_win-$(PACKAGE_VERSION).zip: windist
+
+windist: $(DISTFILES)
+ rm -rf crlf_export
+ cd man && $(MAKE) htmlman
+ svn --native-eol CRLF export . crlf_export
+ ( cd crlf_export && \
+ mkdir $(distdir) && \
+ mkdir $(distdir)/bindings && \
+ mkdir $(distdir)/doc && \
+ mkdir $(distdir)/man && \
+ cp ../man/*[35].html $(distdir)/man && \
+ cp -r bindings/cxx $(distdir)/bindings && \
+ cp -r cmake src test $(distdir) && \
+ $(SED) cmake/CMakeLists.txt \
+ -e 's/-DPACKAGE_VERSION=.*/-DPACKAGE_VERSION="$(PACKAGE_VERSION)"/' \
+ > $(distdir)/cmake/CMakeLists.txt && \
+ cp -r doc/README.cxx doc/unclean_database_recovery.txt $(distdir)/doc && \
+ cp AUTHORS COPYING COPYING.DOC ChangeLog NEWS TODO $(distdir) && \
+ cp README $(distdir)/README && \
+ rm -f $(distdir)/*/Makefile.am $(distdir)/*/*/Makefile.am && \
+ zip -rq getdata_win-$(PACKAGE_VERSION).zip $(distdir) && \
+ cp getdata_win*.zip .. \
+ )
+ rm -rf crlf_export
+
+# package lists
+PACKAGES=$(distdir).tar.gz $(distdir).tar.bz2 idl_$(distdir).tar.gz \
+ idl_$(distdir).tar.bz2 getdata_win-$(PACKAGE_VERSION).zip
+SIGS=$(addsuffix .sig,$(PACKAGES))
+
# release stuff
README.txt: NEWS RELEASE_NOTES.in
cp -f RELEASE_NOTES.in $@
head -n `grep -nm 1 '^|' NEWS | awk 'BEGIN {FS=":"} {print $$1-1}'` NEWS >> $@
-dist-post: $(distdir).tar.gz.sig $(distdir).tar.bz2.sig \
- idl_$(distdir).tar.gz.sig idl_$(distdir).tar.bz2.sig
+dist-post: $(SIGS)
-dist-push: $(distdir).tar.gz.sig $(distdir).tar.bz2.sig \
- $(distdir).tar.gz $(distdir).tar.bz2 idl_$(distdir).tar.gz.sig \
- idl_$(distdir).tar.bz2.sig README.txt
+dist-push: $(PACKAGES) $(SIGS) README.txt
rsync -avP -e ssh $^ $(SFUSER),ge...@fr...:/home/frs/project/g/ge/getdata/getdata/$(PACKAGE_VERSION)/
Modified: branches/getdata-0.7/NEWS
===================================================================
--- branches/getdata-0.7/NEWS 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/NEWS 2011-03-22 04:11:57 UTC (rev 532)
@@ -1,16 +1,20 @@
-New in version 0.7.2rc1:
+New in version 0.7.2rc2:
Library Changes
* If built with modules, the plugin shared objects will now be installed in
a separate directory (by default "${libdir}/getdata", but see the
--with-module-dir option in ./configure).
- * [?MABYE SOMETHING ABOUT MSVC?]
* BUG FIX: When using modules, a missing plugin no longer results in a lock up
the second time an attempt is made to find it.
* BUG FIX: GetData now properly processes /INCLUDE directives with absolute
paths, as the documentation insists it should.
+ Miscellaneous
+
+ * The python module install dir can now be changed by passing
+ --with-python-module-dir to configure.
+
|==============================================================================|
New in version 0.7.1:
Modified: branches/getdata-0.7/m4/version.m4
===================================================================
--- branches/getdata-0.7/m4/version.m4 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/m4/version.m4 2011-03-22 04:11:57 UTC (rev 532)
@@ -21,7 +21,7 @@
m4_define(getdata_major, 0)
m4_define(getdata_minor, 7)
m4_define(getdata_revision, 2)
-m4_define(getdata_extra, [rc1])
+m4_define(getdata_extra, [rc2])
m4_define(getdata_version,
getdata_major.getdata_minor.getdata_revision[]getdata_extra)
Property changes on: branches/getdata-0.7/man
___________________________________________________________________
Modified: svn:ignore
- Makefile
Makefile.in
*.swp
gd_alter_frameoffset.3
gd_alter_encoding.3
gd_alter_endianness.3
+ Makefile
Makefile.in
*.swp
*.html
gd_alter_frameoffset.3
gd_alter_encoding.3
gd_alter_endianness.3
Modified: branches/getdata-0.7/man/Makefile.am
===================================================================
--- branches/getdata-0.7/man/Makefile.am 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/Makefile.am 2011-03-22 04:11:57 UTC (rev 532)
@@ -23,7 +23,7 @@
if LFS_TRANSITIONAL_API
LFS_transitional_mans = gd_getdata64.3 gd_framenum_subset64.3 \
gd_frameoffset64.3 gd_nframes64.3 gd_putdata64.3
-INSTALL_DATA_HOOK64 = install-data-hook64
+MAN3ALIASES64=gd_frameoffset64.3:gd_alter_frameoffset64.3
endif
nodist_man_MANS = gd_alter_encoding.3 gd_alter_endianness.3 \
@@ -52,92 +52,58 @@
dirfile.5 dirfile-encoding.5 dirfile-format.5 \
$(LFS_transitional_mans)
-install-data-hook: ${INSTALL_DATA_HOOK64}
- cd $(DESTDIR)$(mandir)/man3 && \
- $(LN_S) -f gd_add_bit.3 gd_add_clincom.3 && \
- $(LN_S) -f gd_add_bit.3 gd_add_carray.3 && \
- $(LN_S) -f gd_add_bit.3 gd_add_clincom.3 && \
- $(LN_S) -f gd_add_bit.3 gd_add_const.3 && \
- $(LN_S) -f gd_add_bit.3 gd_add_cpolynom.3 && \
- $(LN_S) -f gd_add_bit.3 gd_add_crecip.3 && \
- $(LN_S) -f gd_add_bit.3 gd_add_divide.3 && \
- $(LN_S) -f gd_add_bit.3 gd_add_lincom.3 && \
- $(LN_S) -f gd_add_bit.3 gd_add_linterp.3 && \
- $(LN_S) -f gd_add_bit.3 gd_add_multiply.3 && \
- $(LN_S) -f gd_add_bit.3 gd_add_polynom.3 && \
- $(LN_S) -f gd_add_bit.3 gd_add_phase.3 && \
- $(LN_S) -f gd_add_bit.3 gd_add_raw.3 && \
- $(LN_S) -f gd_add_bit.3 gd_add_recip.3 && \
- $(LN_S) -f gd_add_bit.3 gd_add_sbit.3 && \
- $(LN_S) -f gd_add_bit.3 gd_add_string.3
- cd $(DESTDIR)$(mandir)/man3 && \
- $(LN_S) -f gd_madd_bit.3 gd_madd_clincom.3 && \
- $(LN_S) -f gd_madd_bit.3 gd_madd_carray.3 && \
- $(LN_S) -f gd_madd_bit.3 gd_madd_clincom.3 && \
- $(LN_S) -f gd_madd_bit.3 gd_madd_const.3 && \
- $(LN_S) -f gd_madd_bit.3 gd_madd_cpolynom.3 && \
- $(LN_S) -f gd_madd_bit.3 gd_madd_crecip.3 && \
- $(LN_S) -f gd_madd_bit.3 gd_madd_divide.3 && \
- $(LN_S) -f gd_madd_bit.3 gd_madd_lincom.3 && \
- $(LN_S) -f gd_madd_bit.3 gd_madd_linterp.3 && \
- $(LN_S) -f gd_madd_bit.3 gd_madd_multiply.3 && \
- $(LN_S) -f gd_madd_bit.3 gd_madd_phase.3 && \
- $(LN_S) -f gd_madd_bit.3 gd_madd_polynom.3 && \
- $(LN_S) -f gd_madd_bit.3 gd_madd_recip.3 && \
- $(LN_S) -f gd_madd_bit.3 gd_madd_sbit.3 && \
- $(LN_S) -f gd_madd_bit.3 gd_madd_string.3
- cd $(DESTDIR)$(mandir)/man3 && \
- $(LN_S) -f gd_add.3 gd_madd.3
- cd $(DESTDIR)$(mandir)/man3 && \
- $(LN_S) -f gd_add_spec.3 gd_madd_spec.3
- cd $(DESTDIR)$(mandir)/man3 && \
- $(LN_S) -f gd_cbopen.3 gd_open.3
- cd $(DESTDIR)$(mandir)/man3 && \
- $(LN_S) -f gd_close.3 gd_discard.3
- cd $(DESTDIR)$(mandir)/man3 && \
- $(LN_S) -f gd_alter_bit.3 gd_alter_carray.3 && \
- $(LN_S) -f gd_alter_bit.3 gd_alter_clincom.3 && \
- $(LN_S) -f gd_alter_bit.3 gd_alter_const.3 && \
- $(LN_S) -f gd_alter_bit.3 gd_alter_cpolynom.3 && \
- $(LN_S) -f gd_alter_bit.3 gd_alter_crecip.3 && \
- $(LN_S) -f gd_alter_bit.3 gd_alter_divide.3 && \
- $(LN_S) -f gd_alter_bit.3 gd_alter_lincom.3 && \
- $(LN_S) -f gd_alter_bit.3 gd_alter_linterp.3 && \
- $(LN_S) -f gd_alter_bit.3 gd_alter_multiply.3 && \
- $(LN_S) -f gd_alter_bit.3 gd_alter_phase.3 && \
- $(LN_S) -f gd_alter_bit.3 gd_alter_polynom.3 && \
- $(LN_S) -f gd_alter_bit.3 gd_alter_recip.3 && \
- $(LN_S) -f gd_alter_bit.3 gd_alter_raw.3 && \
- $(LN_S) -f gd_alter_bit.3 gd_alter_sbit.3
- cd $(DESTDIR)$(mandir)/man3 && \
- $(LN_S) -f gd_alter_spec.3 gd_malter_spec.3
- cd $(DESTDIR)$(mandir)/man3 && \
- $(LN_S) -f gd_framenum_subset.3 gd_framenum.3
- cd $(DESTDIR)$(mandir)/man3 && \
- $(LN_S) -f gd_get_carray_slice.3 gd_get_carray.3
- cd $(DESTDIR)$(mandir)/man3 && \
- $(LN_S) -f gd_put_carray_slice.3 gd_put_carray.3
+MAN3ALIASES=gd_add_bit.3:gd_add_carray.3 gd_add_bit.3:gd_add_clincom.3 \
+ gd_add_bit.3:gd_add_const.3 gd_add_bit.3:gd_add_cpolynom.3 \
+ gd_add_bit.3:gd_add_crecip.3 gd_add_bit.3:gd_add_divide.3 \
+ gd_add_bit.3:gd_add_lincom.3 gd_add_bit.3:gd_add_linterp.3 \
+ gd_add_bit.3:gd_add_multiply.3 gd_add_bit.3:gd_add_polynom.3 \
+ gd_add_bit.3:gd_add_phase.3 gd_add_bit.3:gd_add_raw.3 \
+ gd_add_bit.3:gd_add_recip.3 gd_add_bit.3:gd_add_sbit.3 \
+ gd_add_bit.3:gd_add_string.3 gd_madd_bit.3:gd_madd_carray.3 \
+ gd_madd_bit.3:gd_madd_clincom.3 gd_madd_bit.3:gd_madd_const.3 \
+ gd_madd_bit.3:gd_madd_cpolynom.3 gd_madd_bit.3:gd_madd_crecip.3 \
+ gd_madd_bit.3:gd_madd_divide.3 gd_madd_bit.3:gd_madd_lincom.3 \
+ gd_madd_bit.3:gd_madd_linterp.3 gd_madd_bit.3:gd_madd_multiply.3 \
+ gd_madd_bit.3:gd_madd_phase.3 gd_madd_bit.3:gd_madd_polynom.3 \
+ gd_madd_bit.3:gd_madd_recip.3 gd_madd_bit.3:gd_madd_sbit.3 \
+ gd_madd_bit.3:gd_madd_string.3 gd_add.3:gd_madd.3 \
+ gd_add_spec.3:gd_madd_spec.3 gd_cbopen.3:gd_open.3 \
+ gd_close.3:gd_discard.3 gd_alter_bit.3:gd_alter_carray.3 \
+ gd_alter_bit.3:gd_alter_clincom.3 gd_alter_bit.3:gd_alter_const.3 \
+ gd_alter_bit.3:gd_alter_cpolynom.3 gd_alter_bit.3:gd_alter_crecip.3 \
+ gd_alter_bit.3:gd_alter_divide.3 gd_alter_bit.3:gd_alter_lincom.3 \
+ gd_alter_bit.3:gd_alter_linterp.3 gd_alter_bit.3:gd_alter_multiply.3 \
+ gd_alter_bit.3:gd_alter_phase.3 gd_alter_bit.3:gd_alter_polynom.3 \
+ gd_alter_bit.3:gd_alter_recip.3 gd_alter_bit.3:gd_alter_raw.3 \
+ gd_alter_bit.3:gd_alter_sbit.3 gd_alter_spec.3:gd_malter_spec.3 \
+ gd_framenum_subset.3:gd_framenum.3 gd_get_carray_slice.3:gd_get_carray.3 \
+ gd_put_carray_slice.3:gd_put_carray.3 $(MAN3ALIASES64)
-install-data-hook64:
+#man conversion
+HTMLMANS=$(addsuffix .html,$(nodist_man_MANS)) \
+ $(addsuffix .html,$(dist_man_MANS))
+
+%.html: %
+ man2html -r $< | tail -n +2 | $(SED) -e 's/~/\ /g' > $@
+
+htmlman: $(HTMLMANS)
+ for m in $(MAN3ALIASES); do \
+ rm -f `echo $$m | $(SED) -e 's/3/3.html/g' | $(SED) -e 's/.*://'`; \
+ $(LN_S) `echo $$m | $(SED) -e 's/3/3.html/g' | $(SED) -e 's/:/ /'`; \
+ done
+
+install-data-hook:
cd $(DESTDIR)$(mandir)/man3 && \
- $(LN_S) -f gd_frameoffset64.3 gd_alter_frameoffset64.3
+ for m in $(MAN3ALIASES); do \
+ $(LN_S) `echo $$m | $(SED) -e 's/:/ /'`; \
+ done
uninstall-hook:
cd $(DESTDIR)$(mandir)/man3 && \
- rm -rf gd_add_carray.3 gd_add_clincom.3 gd_add_const.3 gd_add_cpolynom.3 \
- gd_add_crecip.3 gd_add_divide.3 gd_add_lincom.3 gd_add_linterp.3 \
- gd_add_multiply.3 gd_add_phase.3 gd_add_polynom.3 gd_add_raw.3 \
- gd_add_recip.3 gd_add_sbit.3 gd_add_string.3 gd_alter_carray.3 \
- gd_alter_clincom.3 gd_alter_const.3 gd_alter_cpolynom.3 gd_alter_crecip.3 \
- gd_alter_divide.3 gd_alter_frameoffset64.3 gd_alter_lincom.3 \
- gd_alter_linterp.3 gd_alter_multiply.3 gd_alter_phase.3 gd_alter_polynom.3 \
- gd_alter_raw.3 gd_alter_recip.3 gd_alter_sbit.3 gd_discard.3 gd_framenum.3 \
- gd_madd_carray.3 gd_madd_clincom.3 gd_madd_const.3 gd_madd_cpolynom.3 \
- gd_madd_crecip.3 gd_madd_divide.3 gd_madd_lincom.3 gd_madd_linterp.3 \
- gd_madd_multiply.3 gd_madd_phase.3 gd_madd_polynom.3 gd_madd_recip.3 \
- gd_madd_sbit.3 gd_madd_string.3 gd_madd.3 gd_madd_spec.3 gd_malter_spec.3 \
- gd_open.3
+ for m in $(MAN3ALIASES); do \
+ rm -f `echo $$m | $(SED) -e 's/.*://'`; \
+ done
clean-local:
- rm -rf *~
- rm -rf gd_alter_encoding.3 gd_alter_endianness.3 gd_alter_frameoffset.3
+ rm -f *~ *.html
+ rm -f $(nodist_man_MANS)
Modified: branches/getdata-0.7/man/gd_add.3
===================================================================
--- branches/getdata-0.7/man/gd_add.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_add.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -172,7 +172,7 @@
support creating an empty binary file to be associated with a newly added
.B RAW
field.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_add_bit.3
===================================================================
--- branches/getdata-0.7/man/gd_add_bit.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_add_bit.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -92,7 +92,7 @@
.BR gd_add_spec (3)
functions to add a new field of the indicated type to the dirfile specified by
.IR dirfile .
-.P
+.PP
In all of these calls,
.I field_name
indicates the name of the field to be added. Further,
@@ -251,7 +251,7 @@
support creating an empty binary file to be associated with a newly added
.B RAW
field.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
@@ -271,7 +271,7 @@
.BR gd_add_clincom (),\~ gd_add_cpolynom (),
and
.BR gd_add_crecip ():
-.P
+.PP
.nf
.B #define GD_C89_API
.B #include <getdata.h>
@@ -292,7 +292,7 @@
.hy
.ad n
.fi
-.P
+.PP
In this case, the array pointers passed as
.IR cm ,\~ cb
or
Modified: branches/getdata-0.7/man/gd_add_spec.3
===================================================================
--- branches/getdata-0.7/man/gd_add_spec.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_add_spec.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -127,7 +127,7 @@
support creating an empty binary file to be associated with a newly added
.B RAW
field.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_alter_bit.3
===================================================================
--- branches/getdata-0.7/man/gd_alter_bit.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_alter_bit.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -78,7 +78,7 @@
.BR gd_alter_entry (3)
function to modify a field of the indicated type in the dirfile specified by
.IR dirfile .
-.P
+.PP
In all of these calls,
.I field_code
indicates the the field to be modified, which may be a regular field, or a
@@ -237,7 +237,7 @@
support translating the binary file associated with a modified
.B RAW
field.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
@@ -249,7 +249,7 @@
.BR gd_alter_clincom (),\~ gd_alter_cpolynom (),
and
.BR gd_alter_crecip ():
-.P
+.PP
.nf
.B #define GD_C89_API
.B #include <getdata.h>
@@ -268,7 +268,7 @@
.hy
.ad n
.fi
-.P
+.PP
In this case, the array pointers passed as
.IR cm ,\~ cb
or
Modified: branches/getdata-0.7/man/gd_alter_entry.3
===================================================================
--- branches/getdata-0.7/man/gd_alter_entry.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_alter_entry.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -237,7 +237,7 @@
support translating the binary file associated with a modified
.B RAW
field.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_alter_protection.3
===================================================================
--- branches/getdata-0.7/man/gd_alter_protection.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_alter_protection.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -55,7 +55,7 @@
.B GD_PROTECT_FORMAT
and
.BR GD_PROTECT_DATA .
-.P
+.PP
In addition to being simply a valid fragment index,
.I fragment_index
may also be the special value
@@ -80,7 +80,7 @@
.TP
.B GD_E_BAD_PROTECTION
The supplied protection level was invalid.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_alter_spec.3
===================================================================
--- branches/getdata-0.7/man/gd_alter_spec.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_alter_spec.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -146,7 +146,7 @@
support translating the empty binary file associated with a modified
.B RAW
field.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_bof.3
===================================================================
--- branches/getdata-0.7/man/gd_bof.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_bof.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -93,7 +93,7 @@
.IR field_code .
This usually indicates a circular dependency in field specification in the
dirfile.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_carray_len.3
===================================================================
--- branches/getdata-0.7/man/gd_carray_len.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_carray_len.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -67,7 +67,7 @@
The representation suffix specified in
.I field_code
was not recognised.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_carrays.3
===================================================================
--- branches/getdata-0.7/man/gd_carrays.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_carrays.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -90,7 +90,7 @@
.fam
.fi
.in
-.P
+.PP
where
.I n
specifies the length of the
@@ -123,7 +123,7 @@
The
.I return_type
specified was invalid.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_cbopen.3
===================================================================
--- branches/getdata-0.7/man/gd_cbopen.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_cbopen.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -68,7 +68,7 @@
.BR GD_RDWR
(read-write), and may also contain zero or more of the following flags,
bitwise-or'd together:
-.P
+.PP
.B GD_ARM_ENDIAN
.PD 0
.TP
@@ -90,7 +90,7 @@
on all but middle-ended ARM systems)
indicates the native behaviour of the platform. That symbol will equal zero,
and may be omitted.
-.P
+.PP
.B GD_BIG_ENDIAN
.PD 0
.TP
@@ -239,7 +239,7 @@
GetData writes nothing to standard error. (GetData never writes to standard
output.)
-.P
+.PP
The
.I flags
argument may also be bitwise or'd with one of the following symbols indicating
@@ -383,7 +383,7 @@
.hy
.ad n
.RE
-.P
+.PP
The
.I extra
parameter is the pointer supplied to
@@ -410,7 +410,7 @@
} gd_parser_data_t;
.fi
.in
-.P
+.PP
The
.IR pdata -> dirfile
member will be a pointer to a DIRFILE object suitable only for passing to
@@ -555,7 +555,7 @@
Note: the line is not corrected on disk; however, the caller may subsequently
correct the fragment on disk by calling
.BR gd_rewrite_fragment (3).
-.P
+.PP
The callback function handles only syntax errors. The parser may still abort
early, if a different kind of library error is encountered. Furthermore,
although a line may contain more than one syntax error, the parser will only
@@ -634,7 +634,7 @@
.TP
.B GD_E_TRUNC
The library was unable to truncate the dirfile.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_close.3
===================================================================
--- branches/getdata-0.7/man/gd_close.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_close.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -68,7 +68,7 @@
returns successfully, the pointer
.I dirfile
should be considered invalid.
-.P
+.PP
Metadata is written to disk using the current Standards Version as stored in the
.I dirfile
object. See
@@ -96,7 +96,7 @@
or
.BR gd_discard ()
may be attempted.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_constants.3
===================================================================
--- branches/getdata-0.7/man/gd_constants.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_constants.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -89,7 +89,7 @@
The
.I return_type
specified was invalid.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_delete.3
===================================================================
--- branches/getdata-0.7/man/gd_delete.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_delete.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -134,7 +134,7 @@
fragment does not support deleting the binary file associated with a
.B RAW
field.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_dirfile_standards.3
===================================================================
--- branches/getdata-0.7/man/gd_dirfile_standards.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_dirfile_standards.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -66,7 +66,7 @@
.B GD_VERSION_LATEST
Specifies the current Standards Version should be set to the latest version
to which the loaded dirfile conforms.
-.P
+.PP
If the loaded dirfile does not conform to the specified
.IR version ,
this function fails, and the current Standards Version is unchanged. If the
@@ -99,7 +99,7 @@
.B GD_E_BAD_VERSION
The loaded dirfile did not conform to the specified version. Or the dirfile
conforms to no known Standards Version.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_dirfilename.3
===================================================================
--- branches/getdata-0.7/man/gd_dirfilename.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_dirfilename.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -51,7 +51,7 @@
.TP 8
.B GD_E_BAD_DIRFILE
The supplied dirfile was invalid.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_encoding.3
===================================================================
--- branches/getdata-0.7/man/gd_encoding.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_encoding.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -52,7 +52,7 @@
.BR GD_ENC_UNSUPPORTED .
.ad n
.hy
-.P
+.PP
See
.BR gd_cbopen (3)
and dirfile-encoding(5) for the meanings of these symbols and details on the
@@ -60,7 +60,7 @@
metadata is unknown to GetData,
.B GD_ENC_UNSUPPORTED
will be returned.
-.P
+.PP
On error, it returns zero and sets the dirfile error to a non-zero error value.
Possible error values are:
.TP 8
@@ -69,7 +69,7 @@
.TP
.B GD_E_BAD_INDEX
The supplied index was out of range.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_endianness.3
===================================================================
--- branches/getdata-0.7/man/gd_endianness.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_endianness.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -62,7 +62,7 @@
.TP
.B GD_E_BAD_INDEX
The supplied index was out of range.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_entry.3
===================================================================
--- branches/getdata-0.7/man/gd_entry.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_entry.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -90,7 +90,7 @@
.TP
.B GD_E_BAD_SCALAR
A scalar parameter used in the definition of the field was invalid.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
@@ -115,7 +115,7 @@
.fam
.fi
.in
-.P
+.PP
The
.I field
member is the field code of the entry (i.e. its string name). If the call to
@@ -123,7 +123,7 @@
is successful, this will be the field name specified as part of the
.I field_code
argument.
-.P
+.PP
The
.I field_type
member indicates the field type of the entry. This is an integer type equal
@@ -137,12 +137,12 @@
.BR GD_RAW_ENTRY ", " GD_RECIP_ENTRY ", " GD_SBIT_ENTRY ", " GD_STRING_ENTRY .
.ad n
.hy
-.P
+.PP
.B GD_INDEX_ENTRY
is a special field type used only for the implicit
.I INDEX
field. The meaning of the other symbols should be self-explanatory.
-.P
+.PP
The
.I fragment_index
member indicates the format specification fragment in which this field is
@@ -156,7 +156,7 @@
.B format
in the root dirfile directory (see
.IR dirfile (5)).
-.P
+.PP
Remaining fields in the gd_entry_t structure depend on the value of
.IR field_type .
Callers are advised to check
@@ -186,7 +186,7 @@
.fam
.fi
.in
-.P
+.PP
Only certain elements of these arrays will be initialised:
.IP \(bu 4
For
@@ -244,12 +244,12 @@
fields, the first element corresponds to
.IR spf .
The remainder are unitialised.
-.P
+.PP
The
.I scalar
parameters are NULL if a literal parameter was used, or else a field code
specifying the scalar parameters.
-.P
+.PP
If an element of
.I scalar
specifies a
@@ -286,11 +286,11 @@
.fam
.fi
.in
-.P
+.PP
The
.I in_fields
member is an array of length one containing the input field code.
-.P
+.PP
The
.I bitnum
member indicates the number of the first bit (counted from zero) extracted from
@@ -302,7 +302,7 @@
will contain the field code itself, otherwise
.IR scalar [0]
will be NULL.
-.P
+.PP
The
.I numbits
member indicates the number of bits which are extracted from the input.
@@ -332,7 +332,7 @@
.fam
.fi
.in
-.P
+.PP
The
.I const_type
member indicates the data type of the constant value stored in the format
@@ -341,7 +341,7 @@
for a list of valid values that a variable of type
.B gd_type_t
may take.
-.P
+.PP
The
.I array_len
member gives the number of elements in the array.
@@ -364,7 +364,7 @@
.fam
.fi
.in
-.P
+.PP
The
.I const_type
member indicates the data type of the constant value stored in the format
@@ -405,7 +405,7 @@
.fam
.fi
.in
-.P
+.PP
The
.I n_fields
member indicates the number of input fields. It will be between one and
@@ -413,7 +413,7 @@
inclusive, which is defined in getdata.h to the maximum number of input fields
permitted by a
.BR LINCOM .
-.P
+.PP
The
.I comp_scal
member is non-zero if any of the scale factors or offset terms have a non-zero
@@ -422,7 +422,7 @@
equal the corresponding elements of
.IR m \~and\~ b .)
members.)
-.P
+.PP
The
.I in_fields
member is an array of length
@@ -431,7 +431,7 @@
.I n_fields
elements of this array are initialised. The remaining elements contain
uninitialised data.
-.P
+.PP
The
.I cm
and
@@ -462,7 +462,7 @@
and
.I cb
when using the C89 GetData API.
-.P
+.PP
The elements of
.I m
and
@@ -491,11 +491,11 @@
.fam
.fi
.in
-.P
+.PP
The
.I table
member is the pathname to the look up table on disk.
-.P
+.PP
The
.I in_fields
member is an array of length one containing the input field code.
@@ -520,7 +520,7 @@
.fam
.fi
.in
-.P
+.PP
The
.I in_fields
member is an array of length two containing the input field codes.
@@ -544,11 +544,11 @@
.fam
.fi
.in
-.P
+.PP
The
.I in_fields
member is an array of length one containing the input field code.
-.P
+.PP
The
.I shift
member indicates the shift in samples. The
@@ -583,7 +583,7 @@
.fam
.fi
.in
-.P
+.PP
The
.I poly_ord
member indicates the order of the polynomial. It will be between one and
@@ -591,7 +591,7 @@
inclusive, which is defined in getdata.h to the maximum order of polynomial
permitted by a
.BR POLYNOM .
-.P
+.PP
The
.I comp_scal
member is non-zero if any of the co-efficients have a non-zero imaginary part.
@@ -599,11 +599,11 @@
.I ca
equal the corresponding elements of
.IR a .)
-.P
+.PP
The
.I in_fields
member is an array of length one containing the input field code.
-.P
+.PP
The
.I ca
members are arrays of the co-efficient(s) for the
@@ -623,7 +623,7 @@
below on changes to the declaration of
.I ca
when using the C89 GetData API.
-.P
+.PP
The elements of
.I a
are the real parts of the corresponding elements of
@@ -650,7 +650,7 @@
.fam
.fi
.in
-.P
+.PP
The
.I comp_scal
member is non-zero if any of the co-efficients have a non-zero imaginary part.
@@ -658,11 +658,11 @@
.I cdividend
equals
.IR dividend .)
-.P
+.PP
The
.I in_fields
member is an array of length one containing the input field code.
-.P
+.PP
The
.I cdividend
member provides the constant dividend of the computed division. If this value
@@ -695,7 +695,7 @@
.fam
.fi
.in
-.P
+.PP
The
.I spf
member contains the samples per frame of the binary data on disk. The
@@ -706,7 +706,7 @@
will contain the field code itself, otherwise
.IR scalar [0]
will be NULL.
-.P
+.PP
The
.I data_type
member indicates the data type of the binary data on disk. See
@@ -751,7 +751,7 @@
gd_type_t|const_type|gd_type_t|u.scalar.const_type
size_t|array_len|size_t|u.scalar.array_len
.TE
-.P
+.PP
In the case of complex valued data in the C89 API, the first element of the two
element array is the real part of the complex number, and the second element is
the imaginary part.
Modified: branches/getdata-0.7/man/gd_entry_type.3
===================================================================
--- branches/getdata-0.7/man/gd_entry_type.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_entry_type.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -70,7 +70,7 @@
The representation suffix specified in
.I field_code
was not recognised.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_eof.3
===================================================================
--- branches/getdata-0.7/man/gd_eof.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_eof.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -119,7 +119,7 @@
The size of the decoded data file associated with the specified field or one of
its inputs could not be determined, because its encoding scheme was not
supported.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_field_list.3
===================================================================
--- branches/getdata-0.7/man/gd_field_list.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_field_list.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -64,7 +64,7 @@
.TP
.B GD_E_BAD_DIRFILE
The supplied dirfile was invalid.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_field_list_by_type.3
===================================================================
--- branches/getdata-0.7/man/gd_field_list_by_type.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_field_list_by_type.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -90,7 +90,7 @@
.TP
.B GD_E_BAD_DIRFILE
The supplied dirfile was invalid.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_flush.3
===================================================================
--- branches/getdata-0.7/man/gd_flush.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_flush.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -42,7 +42,7 @@
also be flushed to disk as if
.BR gd_metaflush (3)
had been called.
-.P
+.PP
Metadata is written to disk using the current Standards Version as stored in the
.I dirfile
object. See
@@ -76,7 +76,7 @@
.TP
.B GD_E_RAW_IO
An error occurred while trying to flush or close the field(s).
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_fragment_index.3
===================================================================
--- branches/getdata-0.7/man/gd_fragment_index.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_fragment_index.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -55,7 +55,7 @@
The representation suffix specified in
.I field_code
was not recognised.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_fragmentname.3
===================================================================
--- branches/getdata-0.7/man/gd_fragmentname.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_fragmentname.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -61,7 +61,7 @@
.TP
.B GD_E_BAD_INDEX
The supplied index was out of range.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_framenum_subset.3
===================================================================
--- branches/getdata-0.7/man/gd_framenum_subset.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_framenum_subset.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -162,7 +162,7 @@
supported by the library. See
.BR dirfile-encoding (5)
for details on dirfile encoding schemes.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_frameoffset.3
===================================================================
--- branches/getdata-0.7/man/gd_frameoffset.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_frameoffset.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -56,7 +56,7 @@
.TP
.B GD_E_BAD_INDEX
The supplied index was out of range.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_get_carray_slice.3
===================================================================
--- branches/getdata-0.7/man/gd_get_carray_slice.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_get_carray_slice.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -175,7 +175,7 @@
An internal error occurred in the library while trying to perform the task.
This indicates a bug in the library. Please report the incident to the
maintainer.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered may be obtained from
Modified: branches/getdata-0.7/man/gd_get_constant.3
===================================================================
--- branches/getdata-0.7/man/gd_get_constant.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_get_constant.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -146,7 +146,7 @@
An internal error occurred in the library while trying to perform the task.
This indicates a bug in the library. Please report the incident to the
maintainer.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered may be obtained from
Modified: branches/getdata-0.7/man/gd_get_string.3
===================================================================
--- branches/getdata-0.7/man/gd_get_string.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_get_string.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -98,7 +98,7 @@
An internal error occurred in the library while trying to perform the task.
This indicates a bug in the library. Please report the incident to the
maintainer.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered may be obtained from
Modified: branches/getdata-0.7/man/gd_getdata.3
===================================================================
--- branches/getdata-0.7/man/gd_getdata.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_getdata.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -226,7 +226,7 @@
.BR dirfile-encoding (5)
for details on dirfile encoding schemes.
.RE
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_include.3
===================================================================
--- branches/getdata-0.7/man/gd_include.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_include.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -37,7 +37,7 @@
the following directive were present:
.IP
.BI "/INCLUDE " <include_file>
-.P
+.PP
(see
.BR dirfile-format (5)).
If a parser callback function had been specified when the dirfile was opened
@@ -162,7 +162,7 @@
already exists, it will be truncated before opening. If the file does not
exist, this flag is ignored.
-.P
+.PP
The
.I flags
argument may also be bitwise or'd with one of the following symbols indicating
@@ -277,7 +277,7 @@
directive will be ignored. See also the
.B BUGS
section below.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_madd_bit.3
===================================================================
--- branches/getdata-0.7/man/gd_madd_bit.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_madd_bit.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -94,7 +94,7 @@
.I parent
in the dirfile specified by
.IR dirfile .
-.P
+.PP
In all of these calls,
.I field_name
indicates the name of the field to be added. It should not be the full
@@ -215,7 +215,7 @@
.TP
.B GD_E_PROTECTED
The metadata of the fragment was protected from change.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
@@ -227,7 +227,7 @@
.BR gd_madd_clincom (),\~ gd_madd_cpolynom (),
and
.BR gd_madd_crecip ():
-.P
+.PP
.nf
.B #define GD_C89_API
.B #include <getdata.h>
@@ -248,7 +248,7 @@
.hy
.ad n
.fi
-.P
+.PP
In this case, the array pointers passed as
.IR cm ", " cb
or
Modified: branches/getdata-0.7/man/gd_mcarrays.3
===================================================================
--- branches/getdata-0.7/man/gd_mcarrays.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_mcarrays.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -89,7 +89,7 @@
.fam
.fi
.in
-.P
+.PP
where
.I n
specifies the length of the
@@ -125,7 +125,7 @@
The
.I return_type
specified was invalid.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_mconstants.3
===================================================================
--- branches/getdata-0.7/man/gd_mconstants.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_mconstants.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -86,7 +86,7 @@
The
.I return_type
specified was invalid.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_metaflush.3
===================================================================
--- branches/getdata-0.7/man/gd_metaflush.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_metaflush.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -32,7 +32,7 @@
to disk. This is accomplished by re-writing the format specification fragments
containing modified metadata overwriting the existing files. Format file
fragments which are unchanged are not touched.
-.P
+.PP
Metadata is written to disk using the current Standards Version as stored in the
.I dirfile
object. See
@@ -40,7 +40,7 @@
to change or report the current Standards Version. If the dirfile metadata
conforms to no known Standards Version, a Standards non-compliant fragment will
be written.
-.P
+.PP
This function flushes only metadata. To flush the field data as well, call
.BR gd_flush (3)
instead.
@@ -62,7 +62,7 @@
An internal error occurred in the library while trying to perform the task.
This indicates a bug in the library. Please report the incident to the
maintainer.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_mfield_list.3
===================================================================
--- branches/getdata-0.7/man/gd_mfield_list.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_mfield_list.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -68,7 +68,7 @@
.TP
.B GD_E_BAD_DIRFILE
The supplied dirfile was invalid.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_mfield_list_by_type.3
===================================================================
--- branches/getdata-0.7/man/gd_mfield_list_by_type.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_mfield_list_by_type.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -91,7 +91,7 @@
.TP
.B GD_E_BAD_DIRFILE
The supplied dirfile was invalid.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_move.3
===================================================================
--- branches/getdata-0.7/man/gd_move.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_move.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -108,7 +108,7 @@
.B GD_E_UNSUPPORTED
The encoding scheme of the source or destination fragment does not support
binary file translation.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_mstrings.3
===================================================================
--- branches/getdata-0.7/man/gd_mstrings.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_mstrings.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -79,7 +79,7 @@
.TP
.B GD_E_BAD_DIRFILE
The supplied dirfile was invalid.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_mvector_list.3
===================================================================
--- branches/getdata-0.7/man/gd_mvector_list.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_mvector_list.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -72,7 +72,7 @@
.TP
.B GD_E_BAD_DIRFILE
The supplied dirfile was invalid.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_native_type.3
===================================================================
--- branches/getdata-0.7/man/gd_native_type.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_native_type.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -102,7 +102,7 @@
.BR GD_INT32 ,\~ GD_FLOAT32 ,\~ GD_FLOAT64 ,\~ GD_COMPLEX64 ,\~ GD_COMPLEX128 .
.ad n
.hy
-.P
+.PP
The meanings of these symbols are explained in the
.BR gd_getdata (3)
manual page. On error, it returns
@@ -142,7 +142,7 @@
.IR field_code .
This usually indicates a circular dependency in field specification in the
dirfile.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_nfields.3
===================================================================
--- branches/getdata-0.7/man/gd_nfields.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_nfields.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -46,7 +46,7 @@
.TP 8
.B GD_E_BAD_DIRFILE
The supplied dirfile was invalid.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_nfields_by_type.3
===================================================================
--- branches/getdata-0.7/man/gd_nfields_by_type.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_nfields_by_type.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -61,7 +61,7 @@
.TP 8
.B GD_E_BAD_DIRFILE
The supplied dirfile was invalid.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_nfragments.3
===================================================================
--- branches/getdata-0.7/man/gd_nfragments.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_nfragments.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -49,7 +49,7 @@
.TP 8
.B GD_E_BAD_DIRFILE
The supplied dirfile was invalid.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_nframes.3
===================================================================
--- branches/getdata-0.7/man/gd_nframes.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_nframes.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -70,7 +70,7 @@
.B GD_E_UNSUPPORTED
The size of the decoded data file associated with the reference field could not
be not be determined because its encoding was not supported.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_nmfields.3
===================================================================
--- branches/getdata-0.7/man/gd_nmfields.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_nmfields.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -50,7 +50,7 @@
.TP
.B GD_E_BAD_DIRFILE
The supplied dirfile was invalid.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_nmfields_by_type.3
===================================================================
--- branches/getdata-0.7/man/gd_nmfields_by_type.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_nmfields_by_type.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -63,7 +63,7 @@
.TP
.B GD_E_BAD_DIRFILE
The supplied dirfile was invalid.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_nmvectors.3
===================================================================
--- branches/getdata-0.7/man/gd_nmvectors.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_nmvectors.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -52,7 +52,7 @@
.TP
.B GD_E_BAD_DIRFILE
The supplied dirfile was invalid.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_nvectors.3
===================================================================
--- branches/getdata-0.7/man/gd_nvectors.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_nvectors.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -51,7 +51,7 @@
.TP 8
.B GD_E_BAD_DIRFILE
The supplied dirfile was invalid.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_parent_fragment.3
===================================================================
--- branches/getdata-0.7/man/gd_parent_fragment.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_parent_fragment.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -52,7 +52,7 @@
.TP
.B GD_E_BAD_INDEX
The supplied index was out of range, or was equal to zero.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_protection.3
===================================================================
--- branches/getdata-0.7/man/gd_protection.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_protection.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -44,7 +44,7 @@
.BR GD_PROTECT_ALL .
.ad n
.hy
-.P
+.PP
The meaning of these symbols are explained in the
.BR gd_alter_protection (3)
man page. On error, it returns -1 and sets the dirfile error to a non-zero
@@ -55,7 +55,7 @@
.TP
.B GD_E_BAD_INDEX
The supplied index was out of range.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_put_carray_slice.3
===================================================================
--- branches/getdata-0.7/man/gd_put_carray_slice.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_put_carray_slice.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -169,7 +169,7 @@
An internal error occurred in the library while trying to perform the task.
This indicates a bug in the library. Please report the incident to the
maintainer.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered may be obtained from
Modified: branches/getdata-0.7/man/gd_put_constant.3
===================================================================
--- branches/getdata-0.7/man/gd_put_constant.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_put_constant.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -141,7 +141,7 @@
.TP
.B GD_E_PROTECTED
The fragment containing the constant was protected from change.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered may be obtained from
Modified: branches/getdata-0.7/man/gd_put_string.3
===================================================================
--- branches/getdata-0.7/man/gd_put_string.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_put_string.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -91,7 +91,7 @@
.TP
.B GD_E_PROTECTED
The fragment containing the string was protected from change.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered may be obtained from
Modified: branches/getdata-0.7/man/gd_putdata.3
===================================================================
--- branches/getdata-0.7/man/gd_putdata.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_putdata.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -208,7 +208,7 @@
.BR dirfile-encoding (5)
for details on dirfile encoding schemes.
.RE
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_raw_filename.3
===================================================================
--- branches/getdata-0.7/man/gd_raw_filename.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_raw_filename.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -71,7 +71,7 @@
.B GD_E_UNKNOWN_ENCODING
The encoding scheme of the specified field could not be determined or was not
understood by GetData.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_reference.3
===================================================================
--- branches/getdata-0.7/man/gd_reference.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_reference.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -78,7 +78,7 @@
The metadata of the primary format specification fragment (the file named
.I format
in the root dirfile directory) was protected from change.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_rename.3
===================================================================
--- branches/getdata-0.7/man/gd_rename.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_rename.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -107,7 +107,7 @@
.TP
.B GD_E_UNSUPPORTED
The encoding scheme of the field does not support binary file renaming.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_rewrite_fragment.3
===================================================================
--- branches/getdata-0.7/man/gd_rewrite_fragment.3 2011-03-20 05:56:37 UTC (rev 531)
+++ branches/getdata-0.7/man/gd_rewrite_fragment.3 2011-03-22 04:11:57 UTC (rev 532)
@@ -13,7 +13,7 @@
.\" Texts. A copy of the license is included in the `COPYING.DOC' file
.\" as part of this distribution.
.\"
-.TH gd_rewrite_fragment 3 "15 October 2010" "Version 0.7.0" "GETDATA"
+.TH gd_rewrite_fragment 3 "22 March 2011" "Version 0.7.2" "GETDATA"
.SH NAME
gd_rewrite_fragment \(em re-write a dirfile format specification fragment
.SH SYNOPSIS
@@ -28,16 +28,16 @@
The
.BR gd_rewrite_fragment ()
writes the format specification fragment specified by
-.I fragment_index
+.I fragment
to disk, regardless of whether it has changed or not, overwriting the existing
file.
-.P
+.PP
In addition to being simply a valid fragment index,
-.I fragment_index
+.I fragment
may also be the special value
.BR GD_ALL_FRAGMENTS ,
which indicates that all fragments should be rewritten.
-.P
+.PP
Metadata is written to disk using the current Standards Version as stored in the
.I dirfile
object. See
@@ -66,7 +66,7 @@
An internal error occurred in the library while trying to perform the task.
This indicates a bug in the library. Please report the incident to the
maintainer.
-.P
+.PP
The dirfile error may be retrieved by calling
.BR gd_error (3).
A descriptive error string for the last error encountered can be obtained from
Modified: branches/getdata-0.7/man/gd_...
[truncated message content] |
|
From: <ket...@us...> - 2011-03-20 05:56:45
|
Revision: 531
http://getdata.svn.sourceforge.net/getdata/?rev=531&view=rev
Author: ketiltrout
Date: 2011-03-20 05:56:37 +0000 (Sun, 20 Mar 2011)
Log Message:
-----------
Might as well look for the single underscore version as well.
Modified Paths:
--------------
branches/getdata-0.7/configure.ac
Modified: branches/getdata-0.7/configure.ac
===================================================================
--- branches/getdata-0.7/configure.ac 2011-03-19 04:51:01 UTC (rev 530)
+++ branches/getdata-0.7/configure.ac 2011-03-20 05:56:37 UTC (rev 531)
@@ -594,6 +594,16 @@
#endif
])
+GD_CHECK_LFS_TYPE([struct _stat64],[
+#ifdef STDC_HEADERS
+#include <sys/types.h>
+#include <sys/stat.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+])
+
GD_CHECK_LFS_TYPE([struct __stat64],[
#ifdef STDC_HEADERS
#include <sys/types.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ket...@us...> - 2011-03-19 04:51:07
|
Revision: 530
http://getdata.svn.sourceforge.net/getdata/?rev=530&view=rev
Author: ketiltrout
Date: 2011-03-19 04:51:01 +0000 (Sat, 19 Mar 2011)
Log Message:
-----------
Better FORTRAN 77 compliance.
Modified Paths:
--------------
branches/getdata-0.7/bindings/f77/test/big_test.f
Modified: branches/getdata-0.7/bindings/f77/test/big_test.f
===================================================================
--- branches/getdata-0.7/bindings/f77/test/big_test.f 2011-03-19 01:36:27 UTC (rev 529)
+++ branches/getdata-0.7/bindings/f77/test/big_test.f 2011-03-19 04:51:01 UTC (rev 530)
@@ -25,7 +25,7 @@
C F77 bindings. Procedures not tested include: GDCOPN GDMFLS GDFLSH
C GDDSCD GDCLBK GDCLOS (although this last one is used)
- PROGRAM GETTST
+ PROGRAM BIGTST
INCLUDE "getdata.f"
CHARACTER*12 fildir
@@ -67,10 +67,20 @@
datdat(k) = k
10 CONTINUE
- fields =(/ 'INDEX ', 'bit ', 'carray ', 'const ', 'data ',
- +'div ', 'lincom ', 'linterp', 'mult ', 'phase ', 'polynom',
- +'recip ', 'sbit ', 'string ', ' ', ' ', ' ',
- +' ', ' ', ' ', ' ' /)
+ fields(1) = 'INDEX '
+ fields(2) = 'bit '
+ fields(3) = 'carray '
+ fields(4) = 'const '
+ fields(5) = 'data '
+ fields(6) = 'div '
+ fields(7) = 'lincom '
+ fields(8) = 'linterp'
+ fields(9) = 'mult '
+ fields(10) = 'phase '
+ fields(11) = 'polynom'
+ fields(12) = 'recip '
+ fields(13) = 'sbit '
+ fields(14) = 'string '
C Write the test dirfile
OPEN(1, FILE=frmat, STATUS='NEW')
@@ -305,7 +315,14 @@
ENDIF
C 13: GDPUTD check
- c = (/ 13_1, 14_1, 15_1, 16_1, 17_1, 18_1, 19_1, 20_1 /)
+ c(1) = 13
+ c(2) = 14
+ c(3) = 15
+ c(4) = 16
+ c(5) = 17
+ c(6) = 18
+ c(7) = 19
+ c(8) = 20
CALL GDPUTD(n, d, 'data', 4, 5, 1, 0, 4, GD_I8, c)
CALL GDEROR(e, d)
@@ -417,7 +434,12 @@
WRITE(*, 2008) 17, 6, fields(3)
ENDIF
- q = (/ 1.1, 2.2, 2.2, 3.3, 5.5, 5.5 /)
+ q(1) = 1.1
+ q(2) = 2.2
+ q(3) = 2.2
+ q(4) = 3.3
+ q(5) = 5.5
+ q(6) = 5.5
DO 170 i=1,6
IF (abs(p(i) - q(i)) .gt. 0.001) THEN
ne = ne + 1
@@ -510,7 +532,12 @@
WRITE(*, 2008) 19, 4, fn
ENDIF
- q = (/ 1.1, 2.2, 2.2, 3.3, 5.5, 5.5 /)
+ q(1) = 1.1
+ q(2) = 2.2
+ q(3) = 2.2
+ q(4) = 3.3
+ q(5) = 5.5
+ q(6) = 5.5
DO 190 i=1,6
IF (abs(p(i) - q(i)) .gt. 0.001) THEN
ne = ne + 1
@@ -832,7 +859,12 @@
WRITE(*, 2008) 29, 7, fields(2)
ENDIF
- q = (/ 9.9, 8.8, 7.7, 6.6, 5.5, 5.5 /)
+ q(1) = 9.9
+ q(2) = 8.8
+ q(3) = 7.7
+ q(4) = 6.6
+ q(5) = 5.5
+ q(6) = 5.5
DO 290 i=1,4
IF (abs(p(i) - q(i)) .gt. 0.001) THEN
ne = ne + 1
@@ -940,7 +972,13 @@
WRITE(*, 2008) 31, 4, fn
ENDIF
- q = (/ 3d3, 4d4, 5d5, 6d6, 5.5d0, 5.5d0 /)
+ q(1) = 3d3
+ q(2) = 4d4
+ q(3) = 5d5
+ q(4) = 6d6
+ q(5) = 5.5d0
+ q(6) = 5.5d0
+
DO 310 i=1,4
IF (abs(p(i) - q(i)) .gt. 0.001) THEN
ne = ne + 1
@@ -1347,10 +1385,27 @@
ENDIF
C 45: GDVECN check
- fields =(/ 'INDEX ', 'bit ', 'data ', 'div ', 'lincom ',
- +'linterp', 'mult ', 'new1 ', 'new10 ', 'new2 ', 'new3 ',
- +'new4 ', 'new5 ', 'new6 ', 'new7 ', 'new8 ', 'new9 ',
- +'phase ', 'polynom', 'recip ', 'sbit ' /)
+ fields(1) = 'INDEX '
+ fields(2) = 'bit '
+ fields(3) = 'data '
+ fields(4) = 'div '
+ fields(5) = 'lincom '
+ fields(6) = 'linterp'
+ fields(7) = 'mult '
+ fields(8) = 'new1 '
+ fields(9) = 'new10 '
+ fields(10) = 'new2 '
+ fields(11) = 'new3 '
+ fields(12) = 'new4 '
+ fields(13) = 'new5 '
+ fields(14) = 'new6 '
+ fields(15) = 'new7 '
+ fields(16) = 'new8 '
+ fields(17) = 'new9 '
+ fields(18) = 'phase '
+ fields(19) = 'polynom'
+ fields(20) = 'recip '
+ fields(21) = 'sbit '
DO 450 i = 1, n
l = flen
CALL GDVECN(fn, l, d, i)
@@ -1417,7 +1472,12 @@
WRITE(*, 2008) 46, 7, fields(2)
ENDIF
- q = (/ 9.9, 8.8, 7.7, 6.6, 5.5, 5.5 /)
+ q(1) = 9.9
+ q(2) = 8.8
+ q(3) = 7.7
+ q(4) = 6.6
+ q(5) = 5.5
+ q(6) = 5.5
DO 460 i=1,4
IF (abs(p(i) - q(i)) .gt. 0.001) THEN
ne = ne + 1
@@ -1525,7 +1585,12 @@
WRITE(*, 2008) 48, 4, fn
ENDIF
- q = (/ 3d3, 4d4, 5d5, 6d6, 5.5d0, 5.5d0 /)
+ q(1) = 3d3
+ q(2) = 4d4
+ q(3) = 5d5
+ q(4) = 6d6
+ q(5) = 5.5d0
+ q(6) = 5.5d0
DO 480 i=1,4
IF (abs(p(i) - q(i)) .gt. 0.001) THEN
ne = ne + 1
@@ -1949,7 +2014,7 @@
WRITE(*, 2006) 61, 1, e
ENDIF
- CALL GDGTCO(d, 'const', 11, GD_F32, fl)
+ CALL GDGTCO(d, 'const', 5, GD_F32, fl)
CALL GDEROR(e, d)
IF (e .NE. GD_EOK) THEN
@@ -2042,10 +2107,16 @@
ENDIF
C 66: GDMVEN check
- fields =(/'mlut ', 'mnew1 ', 'mnew2 ', 'mnew3 ', 'mnew5 ',
- +'mnew6 ', 'mnew7 ', 'mnew8 ', 'mnew9 ', 'mnew10', ' ',
- +' ', ' ', ' ', ' ', ' ', ' ',
- +' ', ' ', ' ', ' '/)
+ fields(1) = 'mlut '
+ fields(2) = 'mnew1 '
+ fields(3) = 'mnew2 '
+ fields(4) = 'mnew3 '
+ fields(5) = 'mnew5 '
+ fields(6) = 'mnew6 '
+ fields(7) = 'mnew7 '
+ fields(8) = 'mnew8 '
+ fields(9) = 'mnew9 '
+ fields(10) = 'mnew10'
DO 660 i = 1, n
l = flen
CALL GDMVEN(fn, l, d, "data", 4, i)
@@ -2149,7 +2220,12 @@
WRITE(*, 2008) 68, 8, fields(3)
ENDIF
- q = (/ 9.9d-1, 7.8d0, 1.1d1, 2.2d-2, 1.96d0, 0d0 /)
+ q(1) = 9.9d-1
+ q(2) = 7.8d0
+ q(3) = 1.1d1
+ q(4) = 2.2d-2
+ q(5) = 1.96d0
+ q(6) = 0d0
DO 680 i=1,6
IF (abs(p(i) - q(i)) .gt. 0.001) THEN
ne = ne + 1
@@ -2257,9 +2333,8 @@
WRITE(*, 2008) 70, 4, fn
ENDIF
- q = (/ 3d0, 4d0, 5d0, 6d0, 7d0, 0d0 /)
DO 700 i=1,5
- IF (abs(p(i) - q(i)) .gt. 0.001) THEN
+ IF (abs(p(i) - 2d0 - i) .gt. 0.001) THEN
ne = ne + 1
WRITE(*, 2010) i, 70, p(i)
ENDIF
@@ -3636,7 +3711,12 @@
1590 CONTINUE
C 168: GDPTCA check
- p = (/ 9.6, 8.5, 7.4, 6.3, 5.2, 4.1 /)
+ p(1) = 9.6
+ p(2) = 8.5
+ p(3) = 7.4
+ p(4) = 6.3
+ p(5) = 5.2
+ p(6) = 4.1
CALL GDPTCA(d, 'carray', 6, GD_F64, p)
CALL GDEROR(e, d)
@@ -3661,7 +3741,12 @@
1680 CONTINUE
C 169: GDGCAS check
- p = (/ 5.5, 5.6, 5.7, 5.8, 5.9, 6.0 /)
+ p(1) = 5.5
+ p(2) = 5.6
+ p(3) = 5.7
+ p(4) = 5.8
+ p(5) = 5.9
+ p(6) = 6.0
CALL GDPCAS(d, 'carray', 6, 3, 2, GD_F64, p)
CALL GDEROR(e, d)
@@ -3731,7 +3816,10 @@
ENDIF
C 179: GDADCA check
- p = (/ 1.2, 3.4, 5.6, 7.8, 0., 0. /)
+ p(1) = 1.2
+ p(2) = 3.4
+ p(3) = 5.6
+ p(4) = 7.8
CALL GDADCA(d, 'new17', 5, GD_F64, 4, GD_F64, p, 0)
CALL GDEROR(e, d)
@@ -3779,7 +3867,10 @@
1790 CONTINUE
C 180: GDMDCA check
- p = (/ 3.2, 5.4, 7.6, 9.8, 0., 0. /)
+ p(1) = 3.2
+ p(2) = 5.4
+ p(3) = 7.6
+ p(4) = 9.8
CALL GDMDCA(d, 'data', 4, 'new17', 5, GD_F64, 4, GD_F64, p)
CALL GDEROR(e, d)
@@ -3878,19 +3969,19 @@
CALL EXIT(1)
ENDIF
- 2001 FORMAT('e[', i0, '] = ', i0)
- 2002 FORMAT('n[', i0, '] = ', i0)
- 2003 FORMAT('ne = ', i0)
- 2004 FORMAT('c(', i0, ')[', i0, '] = ', i0)
- 2005 FORMAT('fl[', i0, '] = ', f0.16)
- 2006 FORMAT('e[', i0, ', ', i0, '] = ', i0)
- 2007 FORMAT('n[', i0, ', ', i0, '] = ', i0)
- 2008 FORMAT('fn(', i0, ')[', i0, '] = "', a, '"')
- 2009 FORMAT('s[' i0, '] = "', a, '"')
- 2010 FORMAT('p(', i0, ')[', i0, '] = ', d16.10)
- 2011 FORMAT('p(', i0, ')[', i0, '] = ', d16.10, ';', d16.10)
- 2012 FORMAT('d[', i0, '] = ', d16.10)
- 2013 FORMAT('x[', i0, '] = ', d16.10, ';', d16.10)
+ 2001 FORMAT('e[', i3, '] = ', i4)
+ 2002 FORMAT('n[', i3, '] = ', i4)
+ 2003 FORMAT('ne = ', i8)
+ 2004 FORMAT('c(', i3, ')[', i3, '] = ', i2)
+ 2005 FORMAT('fl[', i3, '] = ', f0.16)
+ 2006 FORMAT('e[', i3, ', ', i3, '] = ', i4)
+ 2007 FORMAT('n[', i3, ', ', i3, '] = ', i4)
+ 2008 FORMAT('fn(', i3, ')[', i3, '] = "', a, '"')
+ 2009 FORMAT('s[', i3, '] = "', a, '"')
+ 2010 FORMAT('p(', i3, ')[', i3, '] = ', d16.10)
+ 2011 FORMAT('p(', i3, ')[', i3, '] = ', d16.10, ';', d16.10)
+ 2012 FORMAT('d[', i3, '] = ', d16.10)
+ 2013 FORMAT('x[', i3, '] = ', d16.10, ';', d16.10)
STOP
END
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ket...@us...> - 2011-03-19 01:36:33
|
Revision: 529
http://getdata.svn.sourceforge.net/getdata/?rev=529&view=rev
Author: ketiltrout
Date: 2011-03-19 01:36:27 +0000 (Sat, 19 Mar 2011)
Log Message:
-----------
Get idl_getdata package sorted out. Added --with-python-module-dir to configure.
Modified Paths:
--------------
branches/getdata-0.7/ChangeLog
branches/getdata-0.7/Makefile.am
branches/getdata-0.7/bindings/idl/Makefile.am
branches/getdata-0.7/bindings/idl/package/configure.ac
branches/getdata-0.7/m4/python.m4
Property Changed:
----------------
branches/getdata-0.7/bindings/idl/
Modified: branches/getdata-0.7/ChangeLog
===================================================================
--- branches/getdata-0.7/ChangeLog 2011-03-18 10:43:11 UTC (rev 528)
+++ branches/getdata-0.7/ChangeLog 2011-03-19 01:36:27 UTC (rev 529)
@@ -1,3 +1,6 @@
+2011-03-18 D. V. Wiebe <ge...@ke...> svn:529
+ * m4/python.m4: Added --with-python-module-dir
+
2011-03-18 D. V. Wiebe <ge...@ke...> svn:527
* test/test.h: Explicitly use long long format types in the checks.
Modified: branches/getdata-0.7/Makefile.am
===================================================================
--- branches/getdata-0.7/Makefile.am 2011-03-18 10:43:11 UTC (rev 528)
+++ branches/getdata-0.7/Makefile.am 2011-03-19 01:36:27 UTC (rev 529)
@@ -34,7 +34,8 @@
%.sig: %
gpg -abo $@ $<
-DISTCHECK_CONFIGURE_FLAGS = --with-idl-dlm-dir="$$dc_install_base/idl"
+DISTCHECK_CONFIGURE_FLAGS = --with-idl-dlm-dir="$$dc_install_base/idl" \
+ --with-python-module-dir="$$dc_install_base/python"
# idl-only package
idl_$(distdir).tar.bz2 idl_$(distdir).tar.gz: idldist
Property changes on: branches/getdata-0.7/bindings/idl
___________________________________________________________________
Modified: svn:ignore
- makedlm.sh
constants.c
sublist.c
.deps
idl_getdata.dlm
Makefile
Makefile.in
+ makedlm.sh
constants.c
sublist.c
.deps
idl_getdata.dlm
Makefile
Makefile.in
stamp-h2
sublist.stamp
sublist.c.in
Modified: branches/getdata-0.7/bindings/idl/Makefile.am
===================================================================
--- branches/getdata-0.7/bindings/idl/Makefile.am 2011-03-18 10:43:11 UTC (rev 528)
+++ branches/getdata-0.7/bindings/idl/Makefile.am 2011-03-19 01:36:27 UTC (rev 529)
@@ -45,8 +45,8 @@
idl_getdata_la_LDFLAGS = -module -avoid-version -export-symbols-regex IDL_Load \
-precious-files-regex 'idl_getdata\.dlm' $(IDL_LIBS)
idl_getdata_la_LIBADD = $(GDIDL_GETDATA_LIBS)
-idl_getdata_la_SOURCES = getdata.c ${DEBUG_C}
-nodist_idl_getdata_la_SOURCES = constants.c sublist.c
+idl_getdata_la_SOURCES = getdata.c
+nodist_idl_getdata_la_SOURCES = constants.c sublist.c ${DEBUG_C}
sublist.c.in: getdata.c makedlm.sh
${SHELL} ./makedlm.sh -c $< > $@
@@ -94,5 +94,5 @@
cp $< .libs
clean-local:
- rm -rf ${BUILT_SOURCES} *~ idl_getdata.dlm makedlm.sh
+ rm -rf ${BUILT_SOURCES} *~ idl_getdata.dlm makedlm.sh sublist.c.in sublist.stamp
Modified: branches/getdata-0.7/bindings/idl/package/configure.ac
===================================================================
--- branches/getdata-0.7/bindings/idl/package/configure.ac 2011-03-18 10:43:11 UTC (rev 528)
+++ branches/getdata-0.7/bindings/idl/package/configure.ac 2011-03-19 01:36:27 UTC (rev 529)
@@ -63,6 +63,7 @@
AC_PROG_LN_S
AC_PROG_GREP
AC_PROG_AWK
+AC_CHECK_PROGS([DIFF], [diff], [])
AC_PROG_SED
echo
echo "*** Checking C compiler characteristics"
@@ -195,13 +196,14 @@
AC_CONFIG_FILES([src/test/Makefile])
dnl Automake conditionals
-AM_CONDITIONAL(GETDATA_DEBUG, [test "x$enable_debug" == "xyes"])
+AM_CONDITIONAL(GETDATA_DEBUG, [false])
AM_CONDITIONAL(CC_WALL, [test "x$gd_cv_prog_cc_wall" == "xyes"])
AM_CONDITIONAL(INTEL_F77_COMPILER,
[test "x$gd_cv_f77_compiler_intel" == "xyes"])
AM_CONDITIONAL(INTEL_FC_COMPILER, [test "x$gd_cv_fc_compiler_intel" == "xyes"])
AM_CONDITIONAL(LFS_TRANSITIONAL_API, [test "x$gd_cv_type_off64_t" = "xyes"])
AM_CONDITIONAL(TEST_IDL, [test "x$NO_DLOPEN_TESTS" = "x0"])
+AM_CONDITIONAL(HAVE_DIFF, [test "x$DIFF" != "x"])
AM_CONDITIONAL(GDIDL_EXTERNAL, [true])
dnl we do this here to avoid screwing up other tests
Modified: branches/getdata-0.7/m4/python.m4
===================================================================
--- branches/getdata-0.7/m4/python.m4 2011-03-18 10:43:11 UTC (rev 528)
+++ branches/getdata-0.7/m4/python.m4 2011-03-19 01:36:27 UTC (rev 529)
@@ -45,6 +45,15 @@
esac
], [ user_python=; have_python= ])
+AC_ARG_WITH([python-module-dir], AS_HELP_STRING([--with-python-module-dir=PATH],
+ [install the Python bindings into PATH [autodetect]]),
+ [
+ case "${withval}" in
+ no) local_python_modpath= ;;
+ *) local_python_modpath="${withval}"
+ esac
+ ], [ local_python_modpath= ])
+
if test "x${have_python}" != "xno"; then
dnl try to find a sufficiently new python.
@@ -134,7 +143,11 @@
dnl calculate the extension module directory
AC_MSG_CHECKING([Python extension module directory])
-pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='${pyexec_prefix}')" 2>/dev/null || echo "${pyexec_prefix}/lib/python${PYTHON_VERSION}/site-packages"`
+if test "x${local_python_modpath}" = "x"; then
+ pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='${pyexec_prefix}')" 2>/dev/null || echo "${pyexec_prefix}/lib/python${PYTHON_VERSION}/site-packages"`
+else
+ pythondir=$local_python_modpath
+fi
AC_SUBST([pythondir])
AC_MSG_RESULT([$pythondir])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ket...@us...> - 2011-03-18 10:43:17
|
Revision: 528
http://getdata.svn.sourceforge.net/getdata/?rev=528&view=rev
Author: ketiltrout
Date: 2011-03-18 10:43:11 +0000 (Fri, 18 Mar 2011)
Log Message:
-----------
Apparently Fortran 77 only has a one parameter INT intrinsic.
Modified Paths:
--------------
branches/getdata-0.7/bindings/f77/test/big_test.f
branches/getdata-0.7/bindings/f77/test/gdcopn.f
Modified: branches/getdata-0.7/bindings/f77/test/big_test.f
===================================================================
--- branches/getdata-0.7/bindings/f77/test/big_test.f 2011-03-18 08:20:47 UTC (rev 527)
+++ branches/getdata-0.7/bindings/f77/test/big_test.f 2011-03-18 10:43:11 UTC (rev 528)
@@ -46,6 +46,7 @@
CHARACTER*20 str
INTEGER*1 c(8)
INTEGER*1 datdat(80)
+ INTEGER*1 k
INTEGER i
INTEGER d
INTEGER e
@@ -62,8 +63,8 @@
CALL SYSTEM ( 'rm -rf ' // fildir )
CALL SYSTEM ( 'mkdir ' // fildir )
- DO 10 i = 1, 80
- datdat(i) = INT(i,1)
+ DO 10 k = 1, 80
+ datdat(k) = k
10 CONTINUE
fields =(/ 'INDEX ', 'bit ', 'carray ', 'const ', 'data ',
Modified: branches/getdata-0.7/bindings/f77/test/gdcopn.f
===================================================================
--- branches/getdata-0.7/bindings/f77/test/gdcopn.f 2011-03-18 08:20:47 UTC (rev 527)
+++ branches/getdata-0.7/bindings/f77/test/gdcopn.f 2011-03-18 10:43:11 UTC (rev 528)
@@ -26,7 +26,7 @@
CHARACTER*9 frmdat2
PARAMETER (frmdat2 = 'bad line')
INTEGER*1 datdat(80)
- INTEGER i;
+ INTEGER*1 i;
INTEGER d;
INTEGER e;
@@ -34,7 +34,7 @@
CALL SYSTEM ( 'mkdir ' // fildir )
DO 20 i = 1, 80
- datdat(i) = INT(i,1)
+ datdat(i) = i
20 CONTINUE
OPEN(1, FILE=frmat, STATUS='NEW')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ket...@us...> - 2011-03-18 08:20:54
|
Revision: 527
http://getdata.svn.sourceforge.net/getdata/?rev=527&view=rev
Author: ketiltrout
Date: 2011-03-18 08:20:47 +0000 (Fri, 18 Mar 2011)
Log Message:
-----------
Fixed compiler warnings from Matt. Also, don't needlessly rebuild bindings/idl/sublist.c.
Modified Paths:
--------------
branches/getdata-0.7/ChangeLog
branches/getdata-0.7/bindings/f77/getdata.f90.in
branches/getdata-0.7/bindings/f77/test/big_test.f
branches/getdata-0.7/bindings/f77/test/big_test95.f90
branches/getdata-0.7/bindings/f77/test/gdcopn.f
branches/getdata-0.7/bindings/idl/Makefile.am
branches/getdata-0.7/bindings/python/pydirfile.c
branches/getdata-0.7/configure.ac
branches/getdata-0.7/m4/encoding.m4
branches/getdata-0.7/src/common.c
branches/getdata-0.7/src/legacy.c
branches/getdata-0.7/src/raw.c
branches/getdata-0.7/test/test.h
branches/getdata-0.7/util/dirfile2ascii.c
Modified: branches/getdata-0.7/ChangeLog
===================================================================
--- branches/getdata-0.7/ChangeLog 2011-03-18 06:54:43 UTC (rev 526)
+++ branches/getdata-0.7/ChangeLog 2011-03-18 08:20:47 UTC (rev 527)
@@ -1,8 +1,29 @@
+2011-03-18 D. V. Wiebe <ge...@ke...> svn:527
+ * test/test.h: Explicitly use long long format types in the checks.
+
+ * src/legacy.c (GetFormat): Fix memset call.
+
+ * src/common.c (_GD_GetLine): Remove unused first_char.
+
+ * src/raw.c (_GD_RawSeek): nread is a ssize_t.
+
+ * bindings/python/pydirfile.c (gdpy_dirfile_putcarray): Remove unused ns.
+
+ * bindings/f77/test/big_test.f bindings/f77/test/big_test95.f90
+ bindings/f77/test/gdcopn.f bindings/f77/getdata.f90.in: Explicity specify
+ constant kinds to stop the ridiculous complaints from Fedora's gfortran.
+
+ * bindings/idl/Makefile.am: Don't needlessly rebuild sublist.c.
+
+ * m4/encoding.m4: $1 is going to get overwritten, so save it early. Also,
+ don't define $5 and $6 to the same name.
+
2011-03-17 Peter Kümmel <syn...@gm...>
- * use _stat64 and struct _stat64 with msvc
- * fix tests by removing the content of dirfile
- * guard definitions of macros in C++ binding
- * build tests with C89 API
+ * use _stat64 and struct _stat64 with msvc
+ * fix tests by removing the content of dirfile
+ * guard definitions of macros in C++ binding
+ * build tests with C89 API
+
2011-03-17 D. V. Wiebe <ge...@ke...> svn:517
* src/getdata.h.in: Replace #undefs with @DEFINE_...@ tokens. Define
gd_off64_t instead of polluting the namespace. Remove MSCRT specal casing
Modified: branches/getdata-0.7/bindings/f77/getdata.f90.in
===================================================================
--- branches/getdata-0.7/bindings/f77/getdata.f90.in 2011-03-18 06:54:43 UTC (rev 526)
+++ branches/getdata-0.7/bindings/f77/getdata.f90.in 2011-03-18 08:20:47 UTC (rev 527)
@@ -2090,7 +2090,7 @@
character (len=*), intent(in) :: field_name
integer*1, dimension(array_len) :: zero
- zero = 0.
+ zero = 0
call gdadca(dirfile, TRIM(field_name), LEN_TRIM(field_name), const_type, &
array_len, GD_INT8, zero, fragment_index)
@@ -2101,7 +2101,7 @@
character (len=*), intent(in) :: field_name, parent
integer*1, dimension(array_len) :: zero
- zero = 0.
+ zero = 0
call gdmdca(dirfile, TRIM(parent), LEN_TRIM(parent), TRIM(field_name), &
LEN_TRIM(field_name), const_type, array_len, GD_INT8, zero)
@@ -2112,7 +2112,7 @@
character (len=*), intent(in) :: field_name
integer*1, dimension(array_len) :: zero
- zero = 0.
+ zero = 0
call gdalca(dirfile, TRIM(field_name), LEN_TRIM(field_name), const_type, &
array_len)
Modified: branches/getdata-0.7/bindings/f77/test/big_test.f
===================================================================
--- branches/getdata-0.7/bindings/f77/test/big_test.f 2011-03-18 06:54:43 UTC (rev 526)
+++ branches/getdata-0.7/bindings/f77/test/big_test.f 2011-03-18 08:20:47 UTC (rev 527)
@@ -63,7 +63,7 @@
CALL SYSTEM ( 'mkdir ' // fildir )
DO 10 i = 1, 80
- datdat(i) = i
+ datdat(i) = INT(i,1)
10 CONTINUE
fields =(/ 'INDEX ', 'bit ', 'carray ', 'const ', 'data ',
@@ -304,7 +304,7 @@
ENDIF
C 13: GDPUTD check
- c = (/ 13, 14, 15, 16, 17, 18, 19, 20 /)
+ c = (/ 13_1, 14_1, 15_1, 16_1, 17_1, 18_1, 19_1, 20_1 /)
CALL GDPUTD(n, d, 'data', 4, 5, 1, 0, 4, GD_I8, c)
CALL GDEROR(e, d)
Modified: branches/getdata-0.7/bindings/f77/test/big_test95.f90
===================================================================
--- branches/getdata-0.7/bindings/f77/test/big_test95.f90 2011-03-18 06:54:43 UTC (rev 526)
+++ branches/getdata-0.7/bindings/f77/test/big_test95.f90 2011-03-18 08:20:47 UTC (rev 527)
@@ -57,7 +57,7 @@
double complex, dimension(8) :: cc16
do i=1,80
- datadata(i) = i
+ datadata(i) = int(i,1)
end do
call system ( 'rm -rf ' // fildir )
@@ -552,7 +552,7 @@
end if
! 13: fgd_putdata_i1 check
- ci1 = (/ 13, 14, 15, 16, 17, 18, 19, 20 /)
+ ci1 = (/ 13_1, 14_1, 15_1, 16_1, 17_1, 18_1, 19_1, 20_1 /)
n = fgd_putdata_i1(d, 'data', 5, 1, 0, 4, ci1)
e = fgd_error(d)
@@ -577,7 +577,7 @@
end do
! 118: fgd_putdata_i2 check
- ci2 = (/ 23, 24, 25, 26, 27, 28, 29, 30 /)
+ ci2 = (/ 23_2, 24_2, 25_2, 26_2, 27_2, 28_2, 29_2, 30_2 /)
n = fgd_putdata_i2(d, 'data', 5, 1, 0, 4, ci2)
e = fgd_error(d)
@@ -4286,7 +4286,7 @@
end do
! 168: gd_put_carray
- ci1 = (/ 11, 12, 13, 14, 15, 16, 0, 0 /)
+ ci1 = (/ 11_1, 12_1, 13_1, 14_1, 15_1, 16_1, 0_1, 0_1 /)
call fgd_put_carray_i1(d, "carray", 0, 0, ci1)
e = fgd_error(d)
@@ -4311,7 +4311,7 @@
end do
! 169: gd_put_carray_slice (INT8)
- ci1 = (/ 72, 73, 0, 0, 0, 0, 0, 0 /)
+ ci1 = (/ 72_1, 73_1, 0_1, 0_1, 0_1, 0_1, 0_1, 0_1 /)
call fgd_put_carray_i1(d, "carray", 3, 2, ci1)
e = fgd_error(d)
@@ -4343,7 +4343,7 @@
end do
! 170: gd_put_carray_slice (INT16)
- ci2 = (/ 173, 174, 0, 0, 0, 0, 0, 0 /)
+ ci2 = (/ 173_2, 174_2, 0_2, 0_2, 0_2, 0_2, 0_2, 0_2 /)
call fgd_put_carray_i2(d, "carray", 3, 2, ci2)
e = fgd_error(d)
Modified: branches/getdata-0.7/bindings/f77/test/gdcopn.f
===================================================================
--- branches/getdata-0.7/bindings/f77/test/gdcopn.f 2011-03-18 06:54:43 UTC (rev 526)
+++ branches/getdata-0.7/bindings/f77/test/gdcopn.f 2011-03-18 08:20:47 UTC (rev 527)
@@ -34,7 +34,7 @@
CALL SYSTEM ( 'mkdir ' // fildir )
DO 20 i = 1, 80
- datdat(i) = i
+ datdat(i) = INT(i,1)
20 CONTINUE
OPEN(1, FILE=frmat, STATUS='NEW')
Modified: branches/getdata-0.7/bindings/idl/Makefile.am
===================================================================
--- branches/getdata-0.7/bindings/idl/Makefile.am 2011-03-18 06:54:43 UTC (rev 526)
+++ branches/getdata-0.7/bindings/idl/Makefile.am 2011-03-18 08:20:47 UTC (rev 527)
@@ -48,9 +48,35 @@
idl_getdata_la_SOURCES = getdata.c ${DEBUG_C}
nodist_idl_getdata_la_SOURCES = constants.c sublist.c
-sublist.c: getdata.c makedlm.sh
+sublist.c.in: getdata.c makedlm.sh
${SHELL} ./makedlm.sh -c $< > $@
+sublist.c: sublist.stamp
+ @if test ! -f $@; then \
+ rm -f $<; \
+ $(MAKE) $<; \
+ fi
+
+if HAVE_DIFF
+
+sublist.stamp: sublist.c.in
+ @if $(DIFF) sublist.c sublist.c.in >/dev/null 2>&1; then \
+ echo "sublist.c is unchanged"; \
+ else \
+ rm -f sublist.c; \
+ cp sublist.c.in sublist.c; \
+ fi; \
+ touch sublist.stamp
+
+else
+
+sublist.stamp: sublist.c.in
+ @rm -f sublist.c; \
+ cp sublist.c.in sublist.c; \
+ touch sublist.stamp
+
+endif
+
constants.c: ../make_parameters
../make_parameters i > $@
Modified: branches/getdata-0.7/bindings/python/pydirfile.c
===================================================================
--- branches/getdata-0.7/bindings/python/pydirfile.c 2011-03-18 06:54:43 UTC (rev 526)
+++ branches/getdata-0.7/bindings/python/pydirfile.c 2011-03-18 08:20:47 UTC (rev 527)
@@ -1597,7 +1597,6 @@
unsigned int start = 0, len;
gd_type_t type = GD_UNKNOWN;
PyObject* pyobj;
- size_t ns;
if (!PyArg_ParseTupleAndKeywords(args, keys,
"sO|iI:pygetdata.dirfile.putdata", keywords, &field_code, &pyobj,
@@ -1678,7 +1677,7 @@
}
}
- ns = gd_put_carray_slice(self->D, field_code, start, len, type, data);
+ gd_put_carray_slice(self->D, field_code, start, len, type, data);
#ifdef USE_NUMPY
if (have_ndarray)
Modified: branches/getdata-0.7/configure.ac
===================================================================
--- branches/getdata-0.7/configure.ac 2011-03-18 06:54:43 UTC (rev 526)
+++ branches/getdata-0.7/configure.ac 2011-03-18 08:20:47 UTC (rev 527)
@@ -284,6 +284,7 @@
AC_PROG_GREP
AC_PROG_AWK
AC_PROG_SED
+AC_CHECK_PROGS([DIFF], [diff], [])
GD_MSYS_SHELL
echo
echo "*** Checking C compiler characteristics"
@@ -466,7 +467,6 @@
dnl F77 stuff
if test "x$make_f77bindings" != "xno"; then
- AC_CHECK_PROGS([DIFF], [diff], [])
AC_F77_WRAPPERS
fi
@@ -513,8 +513,8 @@
dnl functions
AC_CHECK_FUNCS([_commit fchmod _fdopen fseeko fseeko64 fsync ftello ftello64 \
getdelim gmtime_r _lseeki64 _mkdir mkstemp nan _open _read \
- _rmdir stat64 _stat64 _strtoi64 strtoll _strtoui64 strtoull \
- _unlink _write])
+ _rmdir _snprintf stat64 _stat64 _strtoi64 strtoll _strtoui64 \
+ strtoull _unlink _write])
if test "x$disable_c99" = "xno"; then
AC_CHECK_FUNCS([cabs])
fi
@@ -729,7 +729,7 @@
if test "x$DATE" == "xnot found"; then
BUILD_DATE="Build date unspecified"
else
- BUILD_DATE=`date`
+ BUILD_DATE=`$DATE`
fi
AC_SUBST([BUILD_DATE])
fi
Modified: branches/getdata-0.7/m4/encoding.m4
===================================================================
--- branches/getdata-0.7/m4/encoding.m4 2011-03-18 06:54:43 UTC (rev 526)
+++ branches/getdata-0.7/m4/encoding.m4 2011-03-18 08:20:47 UTC (rev 527)
@@ -26,32 +26,33 @@
[
have_this_header=
have_this_lib=
+m4_define([gd_encoding], [$1])
AC_ARG_WITH([lib$2], AS_HELP_STRING([--with-lib$2=PREFIX],
[use the lib$2 installed in PREFIX [autodetect]]),
[
case "${withval}" in
- no) use_$1="no" ;;
- yes) use_$1="yes"; $1_prefix= ;;
- *) use_$1="yes"; $1_prefix="${withval}" ;;
+ no) use_[]gd_encoding="no" ;;
+ yes) use_[]gd_encoding="yes"; gd_encoding[]_prefix= ;;
+ *) use_[]gd_encoding="yes"; gd_encoding[]_prefix="${withval}" ;;
esac
- ], [ use_$1="yes"; $1_prefix=; ])
+ ], [ use_[]gd_encoding="yes"; gd_encoding[]_prefix=; ])
m4_divert_once([HELP_WITH], AS_HELP_STRING([--without-lib$2],
[disable encodings supported by lib$2, even if the library is present]))
echo
-echo "*** Configuring $1 support"
+echo "*** Configuring gd_encoding support"
echo
if test "x$no_extern" = "xyes"; then
- use_$1="no";
+ use_[]gd_encoding="no";
fi
-if test "x$use_$1" = "xyes"; then
+if test "x$use_[]gd_encoding" = "xyes"; then
dnl search for library
saved_ldflags=$LDFLAGS
saved_libs=$LIBS
- if test "x$[]$1_prefix" != "x"; then
- LDFLAGS="$LDFLAGS -L$[]$1_prefix/lib"
+ if test "x$gd_encoding[]_prefix" != "x"; then
+ LDFLAGS="$LDFLAGS -L$gd_encoding[]_prefix/lib"
fi
AC_CHECK_LIB([$2],[$3],[have_this_lib=yes]
AC_DEFINE(AS_TR_CPP([HAVE_LIB$2]), 1,
@@ -61,36 +62,36 @@
dnl search for header
saved_cppflags=$CPPFLAGS
- if test "x$[]$1_prefix" != "x"; then
- CPPFLAGS="$CPPFLAGS -I$[]$1_prefix/include"
+ if test "x$gd_encoding[]_prefix" != "x"; then
+ CPPFLAGS="$CPPFLAGS -I$gd_encoding[]_prefix/include"
fi
AC_CHECK_HEADERS([$4],[have_this_header=yes])
CPPFLAGS=$saved_cppflags
fi
dnl cleanup
-AS_TR_CPP([$1_CPPFLAGS])=
-AS_TR_CPP([$1_LDFLAGS])=
+AS_TR_CPP(gd_encoding[_CPPFLAGS])=
+AS_TR_CPP(gd_encoding[_LDFLAGS])=
if test "x$have_this_header" = "xyes" -a "x$have_this_lib" = "xyes"; then
- if test "x$[]$1_prefix" = "x"; then
- AS_TR_CPP([$1_LDFLAGS])="-l$2"
- AS_TR_CPP([$1_SEARCHPATH])="$PATH"
+ if test "x$gd_encoding[]_prefix" = "x"; then
+ AS_TR_CPP(gd_encoding[_LDFLAGS])="-l$2"
+ AS_TR_CPP(gd_encoding[_SEARCHPATH])="$PATH"
else
- AS_TR_CPP([$1_CPPFLAGS])="-I$[]$1_prefix/include"
- AS_TR_CPP([$1_LDFLAGS])="-L$[]$1_prefix/lib -l$2"
- AS_TR_CPP([$1_SEARCHPATH])="$[]$1_prefix/bin:$PATH"
+ AS_TR_CPP(gd_encoding[_CPPFLAGS])="-I$gd_encoding[]_prefix/include"
+ AS_TR_CPP(gd_encoding[_LDFLAGS])="-L$gd_encoding[]_prefix/lib -l$2"
+ AS_TR_CPP(gd_encoding[_SEARCHPATH])="$gd_encoding[]_prefix/bin:$PATH"
fi
- AC_DEFINE(AS_TR_CPP([USE_$1]), [], [ Define to enable $1 support ])
+ AC_DEFINE(AS_TR_CPP([USE_]gd_encoding), [], [ Define to enable ]gd_encoding[ support ])
else
- use_$1="no";
- AS_TR_CPP([$1_SEARCHPATH])="$PATH"
+ use_[]gd_encoding="no";
+ AS_TR_CPP(gd_encoding[_SEARCHPATH])="$PATH"
fi
-AC_SUBST(AS_TR_CPP([$1_CPPFLAGS]))
-AC_SUBST(AS_TR_CPP([$1_LDFLAGS]))
+AC_SUBST(AS_TR_CPP(gd_encoding[_CPPFLAGS]))
+AC_SUBST(AS_TR_CPP(gd_encoding[_LDFLAGS]))
dnl executables needed for tests
m4_define(gd_progname, regexp([$5 ], [^\([^ ]*\) ], [\1]))
-AC_PATH_PROGS([path_]gd_progname, [$5], [not found], [$AS_TR_CPP([$1_SEARCHPATH])])
+AC_PATH_PROGS([path_]gd_progname, [$5], [not found], [$AS_TR_CPP(gd_encoding[_SEARCHPATH])])
if test "x$path_[]gd_progname" != "xnot found"; then
AC_DEFINE_UNQUOTED(AS_TR_CPP(gd_progname), ["$path_]gd_progname["],
@@ -98,34 +99,35 @@
fi
ifelse(`x$6', `x',,[
-m4_define(gd_progname, regexp([$6 ], [^\([^ ]*\) ], [\1]))
-AC_PATH_PROGS([path_]gd_progname, [$6], [not found], [$AS_TR_CPP([$1_SEARCHPATH])])
+m4_define(gd_unprogname, regexp([$6 ], [^\([^ ]*\) ], [\1]))
+AC_PATH_PROGS([path_]gd_unprogname, [$6], [not found], [$AS_TR_CPP(gd_encoding[_SEARCHPATH])])
-if test "x$path_[]gd_progname" != "xnot found"; then
- AC_DEFINE_UNQUOTED(AS_TR_CPP(gd_progname), ["$path_]gd_progname["],
- [ Define to the full path to the `]gd_progname[' binary ])
+if test "x$path_[]gd_unprogname" != "xnot found"; then
+ AC_DEFINE_UNQUOTED(AS_TR_CPP(gd_unprogname), ["$path_]gd_unprogname["],
+ [ Define to the full path to the `]gd_unprogname[' binary ])
fi
$7
])
-AM_CONDITIONAL(AS_TR_CPP([USE_$1]), [test "x$use_$1" = "xyes"])
+AM_CONDITIONAL(AS_TR_CPP([USE_]gd_encoding), [test "x$use_]gd_encoding[" = "xyes"])
-if test "x$path_$5" != "xnot found" -a "x$path_$6" != "xnot found"; then
- AC_DEFINE(AS_TR_CPP([TEST_$1]), [], [ Define to enable $1 tests ])
+if test "x$path_[]gd_progname" != "xnot found" -a \
+ "x$path_[]gd_unprogname" != "xnot found"; then
+ AC_DEFINE(AS_TR_CPP([TEST_]gd_encoding), [], [ Define to enable ]gd_encoding[ tests ])
fi
dnl add to summary and private lib list
-if test "x$use_$1" != "xno"; then
+if test "x$use_[]gd_encoding" != "xno"; then
if test "x$use_modules" != "xno"; then
- ENCODINGS_MODS="${ENCODINGS_MODS} $1";
+ ENCODINGS_MODS="${ENCODINGS_MODS} gd_encoding";
else
- ENCODINGS_BUILT="${ENCODINGS_BUILT} $1";
+ ENCODINGS_BUILT="${ENCODINGS_BUILT} gd_encoding";
if test -z "$PRIVATE_LIBS"; then
- PRIVATE_LIBS="[$]AS_TR_CPP([$1_LDFLAGS])"
+ PRIVATE_LIBS="[$]AS_TR_CPP(gd_encoding[_LDFLAGS])"
else
- PRIVATE_LIBS="$PRIVATE_LIBS [$]AS_TR_CPP([$1_LDFLAGS])"
+ PRIVATE_LIBS="$PRIVATE_LIBS [$]AS_TR_CPP(gd_encoding[_LDFLAGS])"
fi
fi
else
- ENCODINGS_LEFT="${ENCODINGS_LEFT} $1";
+ ENCODINGS_LEFT="${ENCODINGS_LEFT} gd_encoding";
fi
])
Modified: branches/getdata-0.7/src/common.c
===================================================================
--- branches/getdata-0.7/src/common.c 2011-03-18 06:54:43 UTC (rev 526)
+++ branches/getdata-0.7/src/common.c 2011-03-18 08:20:47 UTC (rev 527)
@@ -46,7 +46,6 @@
char *_GD_GetLine(FILE *fp, size_t *n, int* linenum)
{
ssize_t len;
- int first_char;
char *line = NULL;
@@ -59,8 +58,6 @@
break;
(*linenum)++;
-
- first_char = 0;
} while (line[0] == '#' || line[0] == 0 || line[0] == '\n');
Modified: branches/getdata-0.7/src/legacy.c
===================================================================
--- branches/getdata-0.7/src/legacy.c 2011-03-18 06:54:43 UTC (rev 526)
+++ branches/getdata-0.7/src/legacy.c 2011-03-18 08:20:47 UTC (rev 527)
@@ -369,7 +369,7 @@
return NULL;
}
- memset(&Format, sizeof(Format), 0);
+ memset(&Format, 0, sizeof(Format));
/* fill the structure -- like everything about the legacy API, this is
* not thread-safe */
Modified: branches/getdata-0.7/src/raw.c
===================================================================
--- branches/getdata-0.7/src/raw.c 2011-03-18 06:54:43 UTC (rev 526)
+++ branches/getdata-0.7/src/raw.c 2011-03-18 08:20:47 UTC (rev 527)
@@ -60,7 +60,7 @@
ssize_t _GD_RawRead(struct _gd_raw_file *file, void *ptr, gd_type_t data_type,
size_t nmemb)
{
- size_t nread;
+ ssize_t nread;
dtrace("%p, %p, %x, %zu", file, ptr, data_type, nmemb);
@@ -69,7 +69,7 @@
if (nread >= 0)
nread /= GD_SIZE(data_type);
- dreturn("%zu", nread);
+ dreturn("%zi", nread);
return nread;
}
Modified: branches/getdata-0.7/test/test.h
===================================================================
--- branches/getdata-0.7/test/test.h 2011-03-18 06:54:43 UTC (rev 526)
+++ branches/getdata-0.7/test/test.h 2011-03-18 08:20:47 UTC (rev 527)
@@ -59,21 +59,21 @@
(double)(v))
#define CHECKFi(i,n,v) CHECKi(i,fabs((n)-(v)) > 1e-10,n,"%.15g","%.15g",\
(double)(n),(double)(v))
-#define CHECKI(n,v) CHECK((n) != (v),n,"%" PRIi64,"%" PRIi64,(long long)(n),\
+#define CHECKI(n,v) CHECK((n) != (v),n,"%lli","%lli",(long long)(n),\
(long long)(v))
-#define CHECKIi(i,n,v) CHECKi(i,(long long)(n) != (long long)(v),n,"%" PRIi64,\
- "%" PRIi64, (long long)(n),(long long)(v))
+#define CHECKIi(i,n,v) CHECKi(i,(long long)(n) != (long long)(v),n,"%lli",\
+ "%lli", (long long)(n),(long long)(v))
#define CHECKP(n) CHECK((n) != NULL,n,"%p","%s",n,"NULL")
#define CHECKPi(i,n) CHECKi(i,(n) != NULL,n,"%p","%s",n,"NULL")
#define CHECKPN(n) CHECK((n) == NULL,n,"%p","%s",n,"non-NULL")
#define CHECKPNi(i,n) CHECKi(i,(n) == NULL,n,"%p","%s",n,"non-NULL")
#define CHECKS(n,v) CHECK(strcmp((n),(v)),n,"\"%s\"","\"%s\"",(n),(v));
#define CHECKSi(n,v) CHECKi(i,strcmp((n),(v)),n,"\"%s\"","\"%s\"",(n),(v));
-#define CHECKU(n,v) CHECK((n) != (v),n,"%" PRIu64,"%" PRIu64,\
+#define CHECKU(n,v) CHECK((n) != (v),n,"%llu","%llu",\
(unsigned long long)(n),(unsigned long long)(v))
-#define CHECKUi(i,n,v) CHECKi(i,(n) != (v),n,"%" PRIu64,"%" PRIu64,\
+#define CHECKUi(i,n,v) CHECKi(i,(n) != (v),n,"%llu","%llu",\
(unsigned long long)(n),(unsigned long long)(v))
-#define CHECKX(n,v) CHECK((n) != (v),n,"0x%" PRIX64,"0x%" PRIX64,\
+#define CHECKX(n,v) CHECK((n) != (v),n,"0x%llX","0x%llX",\
(unsigned long long)(n),(unsigned long long)(v))
-#define CHECKXi(i,n,v) CHECKi(i,(n) != (v),n,"0x%" PRIX64,"0x%" PRIX64,\
+#define CHECKXi(i,n,v) CHECKi(i,(n) != (v),n,"0x%llX","0x%llX",\
(unsigned long long)(n),(unsigned long long)(v))
Modified: branches/getdata-0.7/util/dirfile2ascii.c
===================================================================
--- branches/getdata-0.7/util/dirfile2ascii.c 2011-03-18 06:54:43 UTC (rev 526)
+++ branches/getdata-0.7/util/dirfile2ascii.c 2011-03-18 08:20:47 UTC (rev 527)
@@ -170,7 +170,9 @@
size_t skip = 0;
int skipping = 0;
size_t k, z;
+#if 0
int average = 0;
+#endif
int optind = 0;
const double NaN = NAN;
const struct option longopts[] = {
@@ -297,7 +299,9 @@
zero = optarg;
break;
case 'b':
+#if 0
average = 1;
+#endif
fprintf(stderr, "Warning: Ignoring -b found on command line.\n");
break;
case 'h':
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ket...@us...> - 2011-03-18 06:54:49
|
Revision: 526
http://getdata.svn.sourceforge.net/getdata/?rev=526&view=rev
Author: ketiltrout
Date: 2011-03-18 06:54:43 +0000 (Fri, 18 Mar 2011)
Log Message:
-----------
Prefer strtoi64, if we have it.
Modified Paths:
--------------
branches/getdata-0.7/src/internal.h
Modified: branches/getdata-0.7/src/internal.h
===================================================================
--- branches/getdata-0.7/src/internal.h 2011-03-18 00:26:08 UTC (rev 525)
+++ branches/getdata-0.7/src/internal.h 2011-03-18 06:54:43 UTC (rev 526)
@@ -218,20 +218,20 @@
# endif
#endif
-#ifndef HAVE_STRTOLL
-# ifdef HAVE__STRTOI64
-# define strtoll _strtoi64
-# else
-# define strtoll strtol
-# endif
+#ifdef HAVE__STRTOI64
+# define gd_strtoll _strtoi64
+#elif defined(HAVE_STRTOLL)
+# define gd_strtoll strtoll
+#else
+# define gd_strtoll strtol
#endif
-#ifndef HAVE_STRTOULL
-# ifdef HAVE__STRTOUI64
-# define strtoull _strtoi64
-# else
-# define stroull strtoul
-# endif
+#ifdef HAVE__STRTOUI64
+# define gd_strtoull _strtoi64
+#elif defined(HAVE_STRTOULL)
+# define gd_strtoull strtoull
+#else
+# define gd_strtoull strtoul
#endif
#if defined __MSVCRT__ && defined HAVE__FDOPEN
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <syn...@us...> - 2011-03-18 00:26:14
|
Revision: 525
http://getdata.svn.sourceforge.net/getdata/?rev=525&view=rev
Author: syntheticpp
Date: 2011-03-18 00:26:08 +0000 (Fri, 18 Mar 2011)
Log Message:
-----------
this solution works for nmake, mingw and studio
Modified Paths:
--------------
branches/getdata-0.7/cmake/test/CMakeLists.txt
branches/getdata-0.7/test/add.c
Modified: branches/getdata-0.7/cmake/test/CMakeLists.txt
===================================================================
--- branches/getdata-0.7/cmake/test/CMakeLists.txt 2011-03-18 00:25:28 UTC (rev 524)
+++ branches/getdata-0.7/cmake/test/CMakeLists.txt 2011-03-18 00:26:08 UTC (rev 525)
@@ -49,12 +49,8 @@
#set(gd_sources ${GD_DIR}/test/close.c ${GD_DIR}/test/alter_multiply.c)
-set(__TEST__ "-D__TEST__=\"${CMAKE_BINARY_DIR}\"")
-if(NOT MSVC_IDE)
- STRING(REGEX REPLACE "/" "\\\\\\\\" __TEST__ ${__TEST__})
-else()
- STRING(REGEX REPLACE "/" "\\\\" __TEST__ ${__TEST__})
-endif()
+set(__TEST__ "-D__TEST__=\"${CMAKE_BINARY_DIR}/\"")
+STRING(REGEX REPLACE "/" "\\\\\\\\" __TEST__ ${__TEST__})
add_definitions(${__TEST__})
foreach(_test ${gd_sources})
Modified: branches/getdata-0.7/test/add.c
===================================================================
--- branches/getdata-0.7/test/add.c 2011-03-18 00:25:28 UTC (rev 524)
+++ branches/getdata-0.7/test/add.c 2011-03-18 00:26:08 UTC (rev 525)
@@ -18,6 +18,14 @@
DIRFILE *D;
gd_entry_t E, e;
+ // remove stuff of failed tests
+ unlink(data);
+ unlink(format);
+ rmdir(filedir);
+#ifdef _WIN32
+ system("rmdir /q/s "__TEST__"dirfile");
+#endif
+ printf(format);
E.field = "data";
E.field_type = GD_RAW_ENTRY;
E.fragment_index = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <syn...@us...> - 2011-03-18 00:25:34
|
Revision: 524
http://getdata.svn.sourceforge.net/getdata/?rev=524&view=rev
Author: syntheticpp
Date: 2011-03-18 00:25:28 +0000 (Fri, 18 Mar 2011)
Log Message:
-----------
this solution works for nmake, mingw and studio
Modified Paths:
--------------
trunk/getdata/cmake/test/CMakeLists.txt
trunk/getdata/test/add.c
Modified: trunk/getdata/cmake/test/CMakeLists.txt
===================================================================
--- trunk/getdata/cmake/test/CMakeLists.txt 2011-03-17 23:43:08 UTC (rev 523)
+++ trunk/getdata/cmake/test/CMakeLists.txt 2011-03-18 00:25:28 UTC (rev 524)
@@ -49,12 +49,8 @@
#set(gd_sources ${GD_DIR}/test/close.c ${GD_DIR}/test/alter_multiply.c)
-set(__TEST__ "-D__TEST__=\"${CMAKE_BINARY_DIR}\"")
-if(NOT MSVC_IDE)
- STRING(REGEX REPLACE "/" "\\\\\\\\" __TEST__ ${__TEST__})
-else()
- STRING(REGEX REPLACE "/" "\\\\" __TEST__ ${__TEST__})
-endif()
+set(__TEST__ "-D__TEST__=\"${CMAKE_BINARY_DIR}/\"")
+STRING(REGEX REPLACE "/" "\\\\\\\\" __TEST__ ${__TEST__})
add_definitions(${__TEST__})
foreach(_test ${gd_sources})
Modified: trunk/getdata/test/add.c
===================================================================
--- trunk/getdata/test/add.c 2011-03-17 23:43:08 UTC (rev 523)
+++ trunk/getdata/test/add.c 2011-03-18 00:25:28 UTC (rev 524)
@@ -18,6 +18,14 @@
DIRFILE *D;
gd_entry_t E, e;
+ // remove stuff of failed tests
+ unlink(data);
+ unlink(format);
+ rmdir(filedir);
+#ifdef _WIN32
+ system("rmdir /q/s "__TEST__"dirfile");
+#endif
+ printf(format);
E.field = "data";
E.field_type = GD_RAW_ENTRY;
E.fragment_index = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <syn...@us...> - 2011-03-17 23:43:14
|
Revision: 523
http://getdata.svn.sourceforge.net/getdata/?rev=523&view=rev
Author: syntheticpp
Date: 2011-03-17 23:43:08 +0000 (Thu, 17 Mar 2011)
Log Message:
-----------
fix tests for mingw
Modified Paths:
--------------
branches/getdata-0.7/cmake/test/CMakeLists.txt
branches/getdata-0.7/test/move_subdir.c
Modified: branches/getdata-0.7/cmake/test/CMakeLists.txt
===================================================================
--- branches/getdata-0.7/cmake/test/CMakeLists.txt 2011-03-17 23:41:01 UTC (rev 522)
+++ branches/getdata-0.7/cmake/test/CMakeLists.txt 2011-03-17 23:43:08 UTC (rev 523)
@@ -48,8 +48,13 @@
#set(gd_sources ${GD_DIR}/test/close.c ${GD_DIR}/test/alter_multiply.c)
-set(__TEST__ "-D__TEST__=\"${CMAKE_BINARY_DIR}/\"")
-STRING(REGEX REPLACE "/" "\\\\\\\\\\\\" __TEST__ ${__TEST__})
+
+set(__TEST__ "-D__TEST__=\"${CMAKE_BINARY_DIR}\"")
+if(NOT MSVC_IDE)
+ STRING(REGEX REPLACE "/" "\\\\\\\\" __TEST__ ${__TEST__})
+else()
+ STRING(REGEX REPLACE "/" "\\\\" __TEST__ ${__TEST__})
+endif()
add_definitions(${__TEST__})
foreach(_test ${gd_sources})
Modified: branches/getdata-0.7/test/move_subdir.c
===================================================================
--- branches/getdata-0.7/test/move_subdir.c 2011-03-17 23:41:01 UTC (rev 522)
+++ branches/getdata-0.7/test/move_subdir.c 2011-03-17 23:43:08 UTC (rev 523)
@@ -27,6 +27,7 @@
// when using msvc the macro mkdir removes dirfile
#ifdef mkdir
#undef mkdir
+#define mkdir(x,y) mkdir(x)
#endif
mkdir(subdir, 0777);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <syn...@us...> - 2011-03-17 23:41:07
|
Revision: 522
http://getdata.svn.sourceforge.net/getdata/?rev=522&view=rev
Author: syntheticpp
Date: 2011-03-17 23:41:01 +0000 (Thu, 17 Mar 2011)
Log Message:
-----------
fix tests for mingw
Modified Paths:
--------------
trunk/getdata/cmake/test/CMakeLists.txt
trunk/getdata/test/move_subdir.c
Modified: trunk/getdata/cmake/test/CMakeLists.txt
===================================================================
--- trunk/getdata/cmake/test/CMakeLists.txt 2011-03-17 22:49:43 UTC (rev 521)
+++ trunk/getdata/cmake/test/CMakeLists.txt 2011-03-17 23:41:01 UTC (rev 522)
@@ -48,8 +48,13 @@
#set(gd_sources ${GD_DIR}/test/close.c ${GD_DIR}/test/alter_multiply.c)
-set(__TEST__ "-D__TEST__=\"${CMAKE_BINARY_DIR}/\"")
-STRING(REGEX REPLACE "/" "\\\\\\\\\\\\" __TEST__ ${__TEST__})
+
+set(__TEST__ "-D__TEST__=\"${CMAKE_BINARY_DIR}\"")
+if(NOT MSVC_IDE)
+ STRING(REGEX REPLACE "/" "\\\\\\\\" __TEST__ ${__TEST__})
+else()
+ STRING(REGEX REPLACE "/" "\\\\" __TEST__ ${__TEST__})
+endif()
add_definitions(${__TEST__})
foreach(_test ${gd_sources})
Modified: trunk/getdata/test/move_subdir.c
===================================================================
--- trunk/getdata/test/move_subdir.c 2011-03-17 22:49:43 UTC (rev 521)
+++ trunk/getdata/test/move_subdir.c 2011-03-17 23:41:01 UTC (rev 522)
@@ -27,6 +27,7 @@
// when using msvc the macro mkdir removes dirfile
#ifdef mkdir
#undef mkdir
+#define mkdir(x,y) mkdir(x)
#endif
mkdir(subdir, 0777);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <syn...@us...> - 2011-03-17 22:49:49
|
Revision: 521
http://getdata.svn.sourceforge.net/getdata/?rev=521&view=rev
Author: syntheticpp
Date: 2011-03-17 22:49:43 +0000 (Thu, 17 Mar 2011)
Log Message:
-----------
fix date of changlog entry
Modified Paths:
--------------
trunk/getdata/ChangeLog
Modified: trunk/getdata/ChangeLog
===================================================================
--- trunk/getdata/ChangeLog 2011-03-17 22:49:29 UTC (rev 520)
+++ trunk/getdata/ChangeLog 2011-03-17 22:49:43 UTC (rev 521)
@@ -1,4 +1,4 @@
-2010-12-13 Peter Kümmel <syn...@gm...>
+2010-03-17 Peter Kümmel <syn...@gm...>
* use _stat64 and struct _stat64 with msvc
* fix tests by removing the content of dirfile
* guard definitions of macros in C++ binding
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <syn...@us...> - 2011-03-17 22:49:35
|
Revision: 520
http://getdata.svn.sourceforge.net/getdata/?rev=520&view=rev
Author: syntheticpp
Date: 2011-03-17 22:49:29 +0000 (Thu, 17 Mar 2011)
Log Message:
-----------
fix date of changlog entry
Modified Paths:
--------------
branches/getdata-0.7/ChangeLog
Modified: branches/getdata-0.7/ChangeLog
===================================================================
--- branches/getdata-0.7/ChangeLog 2011-03-17 22:48:04 UTC (rev 519)
+++ branches/getdata-0.7/ChangeLog 2011-03-17 22:49:29 UTC (rev 520)
@@ -1,4 +1,4 @@
-2011-03-17 Peter Kümmel <syn...@gm...>
+2011-03-17 Peter Kümmel <syn...@gm...>
* use _stat64 and struct _stat64 with msvc
* fix tests by removing the content of dirfile
* guard definitions of macros in C++ binding
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <syn...@us...> - 2011-03-17 22:48:11
|
Revision: 519
http://getdata.svn.sourceforge.net/getdata/?rev=519&view=rev
Author: syntheticpp
Date: 2011-03-17 22:48:04 +0000 (Thu, 17 Mar 2011)
Log Message:
-----------
make msvc support ready for release
Modified Paths:
--------------
branches/getdata-0.7/ChangeLog
branches/getdata-0.7/bindings/cxx/getdata/dirfile.h
branches/getdata-0.7/bindings/cxx/getdata/entry.h
branches/getdata-0.7/bindings/cxx/getdata/fragment.h
branches/getdata-0.7/cmake/CMakeLists.txt
branches/getdata-0.7/cmake/bindings/cxx/CMakeLists.txt
branches/getdata-0.7/cmake/test/CMakeLists.txt
branches/getdata-0.7/src/internal.h
branches/getdata-0.7/test/move_subdir.c
Modified: branches/getdata-0.7/ChangeLog
===================================================================
--- branches/getdata-0.7/ChangeLog 2011-03-17 22:43:24 UTC (rev 518)
+++ branches/getdata-0.7/ChangeLog 2011-03-17 22:48:04 UTC (rev 519)
@@ -1,3 +1,8 @@
+2011-03-17 Peter Kümmel <syn...@gm...>
+ * use _stat64 and struct _stat64 with msvc
+ * fix tests by removing the content of dirfile
+ * guard definitions of macros in C++ binding
+ * build tests with C89 API
2011-03-17 D. V. Wiebe <ge...@ke...> svn:517
* src/getdata.h.in: Replace #undefs with @DEFINE_...@ tokens. Define
gd_off64_t instead of polluting the namespace. Remove MSCRT specal casing
Modified: branches/getdata-0.7/bindings/cxx/getdata/dirfile.h
===================================================================
--- branches/getdata-0.7/bindings/cxx/getdata/dirfile.h 2011-03-17 22:43:24 UTC (rev 518)
+++ branches/getdata-0.7/bindings/cxx/getdata/dirfile.h 2011-03-17 22:48:04 UTC (rev 519)
@@ -23,11 +23,15 @@
#define GETDATA_DIRFILE_H
// We don't want the legacy API since its symbols clash with us.
-#define GD_NO_LEGACY_API
+#ifndef GD_NO_LEGACY_API
+# define GD_NO_LEGACY_API
+#endif
// We use the C89 API since C++ compilers aren't required to support the
// C99 _Complex keyword
-#define GD_C89_API
+#ifndef GD_C89_API
+# define GD_C89_API
+#endif
#include <getdata.h>
Modified: branches/getdata-0.7/bindings/cxx/getdata/entry.h
===================================================================
--- branches/getdata-0.7/bindings/cxx/getdata/entry.h 2011-03-17 22:43:24 UTC (rev 518)
+++ branches/getdata-0.7/bindings/cxx/getdata/entry.h 2011-03-17 22:48:04 UTC (rev 519)
@@ -26,8 +26,12 @@
# define _FILE_OFFSET_BITS 64
#endif
-#define GD_NO_LEGACY_API
-#define GD_C89_API
+#ifndef GD_NO_LEGACY_API
+# define GD_NO_LEGACY_API
+#endif
+#ifndef GD_C89_API
+# define GD_C89_API
+#endif
extern "C" {
#include <getdata.h>
Modified: branches/getdata-0.7/bindings/cxx/getdata/fragment.h
===================================================================
--- branches/getdata-0.7/bindings/cxx/getdata/fragment.h 2011-03-17 22:43:24 UTC (rev 518)
+++ branches/getdata-0.7/bindings/cxx/getdata/fragment.h 2011-03-17 22:48:04 UTC (rev 519)
@@ -26,8 +26,12 @@
# define _FILE_OFFSET_BITS 64
#endif
-#define GD_NO_LEGACY_API
-#define GD_C89_API
+#ifndef GD_NO_LEGACY_API
+# define GD_NO_LEGACY_API
+#endif
+#ifndef GD_C89_API
+# define GD_C89_API
+#endif
extern "C" {
#include <getdata.h>
Modified: branches/getdata-0.7/cmake/CMakeLists.txt
===================================================================
--- branches/getdata-0.7/cmake/CMakeLists.txt 2011-03-17 22:43:24 UTC (rev 518)
+++ branches/getdata-0.7/cmake/CMakeLists.txt 2011-03-17 22:48:04 UTC (rev 519)
@@ -52,8 +52,8 @@
-DHAVE_INTTYPES_H
-DHAVE_IO_H
-DHAVE_STDINT_H
+ -DHAVE__STAT64
-DHAVE_STRUCT__STAT64
- -DHAVE__STAT64
-DHAVE__COMMIT
-DHAVE__STRTOI64
-DHAVE__STRTOUI64
Modified: branches/getdata-0.7/cmake/bindings/cxx/CMakeLists.txt
===================================================================
--- branches/getdata-0.7/cmake/bindings/cxx/CMakeLists.txt 2011-03-17 22:43:24 UTC (rev 518)
+++ branches/getdata-0.7/cmake/bindings/cxx/CMakeLists.txt 2011-03-17 22:48:04 UTC (rev 519)
@@ -4,8 +4,14 @@
include_directories(${GD_DIR}/bindings/cxx)
-add_library(getdata++ STATIC ${h_headers} ${s_sources})
+set(GD_CXX getdata++)
+if(MSVC AND NOT MSVC_IDE)
+ # nmake could not handle ++ in the path
+ set(GD_CXX getdataxx)
+endif()
+add_library(${GD_CXX} STATIC ${h_headers} ${s_sources})
+
install(FILES ${h_headers} DESTINATION include/getdata)
-install(TARGETS getdata++ DESTINATION lib)
+install(TARGETS ${GD_CXX} DESTINATION lib)
Modified: branches/getdata-0.7/cmake/test/CMakeLists.txt
===================================================================
--- branches/getdata-0.7/cmake/test/CMakeLists.txt 2011-03-17 22:43:24 UTC (rev 518)
+++ branches/getdata-0.7/cmake/test/CMakeLists.txt 2011-03-17 22:48:04 UTC (rev 519)
@@ -2,12 +2,16 @@
GD_FILES(gd test)
+add_definitions(-DGD_C89_API)
+
set(tests_ignored
bzip_get bzip_get_get bzip_move_from bzip_nframes bzip_put
gzip_get gzip_get_get gzip_move_from gzip_nframes gzip_put
lzma_get lzma_nframes
legacy_get legacy_get_put legacy_get_rofs legacy_nframes legacy_nonexistent legacy_put legacy_spf
+ open_eaccess
slim_get slim_nframes slim_put
+ trunc_rofs
xz_get xz_nframes
)
@@ -15,13 +19,13 @@
set(tests_ignored
${tests_ignored}
endian_alter endian_get endian_move
- get64 get_uint64 get_endian64 get_int64
+ get64 get_uint64 get_endian64 get_int64 get_off64
include_cb include_pc
index_domain index_range
move_data_endian
nframes64
open_cb_abort open_cb_cont open_cb_ignore open_cb_invalid open_cb_rescan
- put64 put_endian64
+ put64 put_endian64 put_off64
)
endif()
@@ -44,14 +48,16 @@
#set(gd_sources ${GD_DIR}/test/close.c ${GD_DIR}/test/alter_multiply.c)
-add_definitions(-D__TEST__=\"${CMAKE_BINARY_DIR}/\")
+set(__TEST__ "-D__TEST__=\"${CMAKE_BINARY_DIR}/\"")
+STRING(REGEX REPLACE "/" "\\\\\\\\\\\\" __TEST__ ${__TEST__})
+add_definitions(${__TEST__})
foreach(_test ${gd_sources})
get_filename_component(testname ${_test} NAME_WE)
set(testname test_${testname})
add_executable(${testname} ${_test})
target_link_libraries(${testname} getdata)
- add_test(${testname} ${testname})
+ add_test(NAME ${testname} COMMAND ${testname})
endforeach()
Modified: branches/getdata-0.7/src/internal.h
===================================================================
--- branches/getdata-0.7/src/internal.h 2011-03-17 22:43:24 UTC (rev 518)
+++ branches/getdata-0.7/src/internal.h 2011-03-17 22:48:04 UTC (rev 519)
@@ -298,6 +298,8 @@
#if HAVE_STRUCT_STAT64
typedef struct stat64 gd_stat64_t;
+#elif HAVE_STRUCT__STAT64
+typedef struct _stat64 gd_stat64_t;
#elif HAVE_STRUCT___STAT64
typedef struct __stat64 gd_stat64_t;
#else
Modified: branches/getdata-0.7/test/move_subdir.c
===================================================================
--- branches/getdata-0.7/test/move_subdir.c 2011-03-17 22:43:24 UTC (rev 518)
+++ branches/getdata-0.7/test/move_subdir.c 2011-03-17 22:48:04 UTC (rev 519)
@@ -24,6 +24,10 @@
DIRFILE *D;
mkdir(filedir, 0777);
+ // when using msvc the macro mkdir removes dirfile
+#ifdef mkdir
+#undef mkdir
+#endif
mkdir(subdir, 0777);
fd = open(format, O_CREAT | O_EXCL | O_WRONLY, 0666);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <syn...@us...> - 2011-03-17 22:43:31
|
Revision: 518
http://getdata.svn.sourceforge.net/getdata/?rev=518&view=rev
Author: syntheticpp
Date: 2011-03-17 22:43:24 +0000 (Thu, 17 Mar 2011)
Log Message:
-----------
make msvc support ready for release
Modified Paths:
--------------
trunk/getdata/ChangeLog
trunk/getdata/bindings/cxx/getdata/dirfile.h
trunk/getdata/bindings/cxx/getdata/entry.h
trunk/getdata/bindings/cxx/getdata/fragment.h
trunk/getdata/cmake/CMakeLists.txt
trunk/getdata/cmake/bindings/cxx/CMakeLists.txt
trunk/getdata/cmake/test/CMakeLists.txt
trunk/getdata/src/internal.h
trunk/getdata/test/move_subdir.c
Modified: trunk/getdata/ChangeLog
===================================================================
--- trunk/getdata/ChangeLog 2011-03-17 01:48:56 UTC (rev 517)
+++ trunk/getdata/ChangeLog 2011-03-17 22:43:24 UTC (rev 518)
@@ -1,3 +1,8 @@
+2010-12-13 Peter Kümmel <syn...@gm...>
+ * use _stat64 and struct _stat64 with msvc
+ * fix tests by removing the content of dirfile
+ * guard definitions of macros in C++ binding
+ * build tests with C89 API
2011-03-03 D. V. Wiebe <ge...@ke...> svn:510
* m4/idl.m4: Munge IDL_LIBS to convert "-m <arg>" into "-m<arg>" since
libtool seems to delete <arg> if that's not the case.
Modified: trunk/getdata/bindings/cxx/getdata/dirfile.h
===================================================================
--- trunk/getdata/bindings/cxx/getdata/dirfile.h 2011-03-17 01:48:56 UTC (rev 517)
+++ trunk/getdata/bindings/cxx/getdata/dirfile.h 2011-03-17 22:43:24 UTC (rev 518)
@@ -23,11 +23,15 @@
#define GETDATA_DIRFILE_H
// We don't want the legacy API since its symbols clash with us.
-#define GD_NO_LEGACY_API
+#ifndef GD_NO_LEGACY_API
+# define GD_NO_LEGACY_API
+#endif
// We use the C89 API since C++ compilers aren't required to support the
// C99 _Complex keyword
-#define GD_C89_API
+#ifndef GD_C89_API
+# define GD_C89_API
+#endif
#include <getdata.h>
Modified: trunk/getdata/bindings/cxx/getdata/entry.h
===================================================================
--- trunk/getdata/bindings/cxx/getdata/entry.h 2011-03-17 01:48:56 UTC (rev 517)
+++ trunk/getdata/bindings/cxx/getdata/entry.h 2011-03-17 22:43:24 UTC (rev 518)
@@ -26,8 +26,12 @@
# define _FILE_OFFSET_BITS 64
#endif
-#define GD_NO_LEGACY_API
-#define GD_C89_API
+#ifndef GD_NO_LEGACY_API
+# define GD_NO_LEGACY_API
+#endif
+#ifndef GD_C89_API
+# define GD_C89_API
+#endif
extern "C" {
#include <getdata.h>
Modified: trunk/getdata/bindings/cxx/getdata/fragment.h
===================================================================
--- trunk/getdata/bindings/cxx/getdata/fragment.h 2011-03-17 01:48:56 UTC (rev 517)
+++ trunk/getdata/bindings/cxx/getdata/fragment.h 2011-03-17 22:43:24 UTC (rev 518)
@@ -26,8 +26,12 @@
# define _FILE_OFFSET_BITS 64
#endif
-#define GD_NO_LEGACY_API
-#define GD_C89_API
+#ifndef GD_NO_LEGACY_API
+# define GD_NO_LEGACY_API
+#endif
+#ifndef GD_C89_API
+# define GD_C89_API
+#endif
extern "C" {
#include <getdata.h>
Modified: trunk/getdata/cmake/CMakeLists.txt
===================================================================
--- trunk/getdata/cmake/CMakeLists.txt 2011-03-17 01:48:56 UTC (rev 517)
+++ trunk/getdata/cmake/CMakeLists.txt 2011-03-17 22:43:24 UTC (rev 518)
@@ -40,8 +40,8 @@
-DHAVE_INTTYPES_H
-DHAVE_IO_H
-DHAVE_STDINT_H
+ -DHAVE__STAT64
-DHAVE_STRUCT__STAT64
- -DHAVE__STAT64
-DHAVE__COMMIT
-DGD_NO_C99_API
)
Modified: trunk/getdata/cmake/bindings/cxx/CMakeLists.txt
===================================================================
--- trunk/getdata/cmake/bindings/cxx/CMakeLists.txt 2011-03-17 01:48:56 UTC (rev 517)
+++ trunk/getdata/cmake/bindings/cxx/CMakeLists.txt 2011-03-17 22:43:24 UTC (rev 518)
@@ -4,8 +4,14 @@
include_directories(${GD_DIR}/bindings/cxx)
-add_library(getdata++ STATIC ${h_headers} ${s_sources})
+set(GD_CXX getdata++)
+if(MSVC AND NOT MSVC_IDE)
+ # nmake could not handle ++ in the path
+ set(GD_CXX getdataxx)
+endif()
+add_library(${GD_CXX} STATIC ${h_headers} ${s_sources})
+
install(FILES ${h_headers} DESTINATION include/getdata)
-install(TARGETS getdata++ DESTINATION lib)
+install(TARGETS ${GD_CXX} DESTINATION lib)
Modified: trunk/getdata/cmake/test/CMakeLists.txt
===================================================================
--- trunk/getdata/cmake/test/CMakeLists.txt 2011-03-17 01:48:56 UTC (rev 517)
+++ trunk/getdata/cmake/test/CMakeLists.txt 2011-03-17 22:43:24 UTC (rev 518)
@@ -2,12 +2,16 @@
GD_FILES(gd test)
+add_definitions(-DGD_C89_API)
+
set(tests_ignored
bzip_get bzip_get_get bzip_move_from bzip_nframes bzip_put
gzip_get gzip_get_get gzip_move_from gzip_nframes gzip_put
lzma_get lzma_nframes
legacy_get legacy_get_put legacy_get_rofs legacy_nframes legacy_nonexistent legacy_put legacy_spf
+ open_eaccess
slim_get slim_nframes slim_put
+ trunc_rofs
xz_get xz_nframes
)
@@ -15,13 +19,13 @@
set(tests_ignored
${tests_ignored}
endian_alter endian_get endian_move
- get64 get_uint64 get_endian64 get_int64
+ get64 get_uint64 get_endian64 get_int64 get_off64
include_cb include_pc
index_domain index_range
move_data_endian
nframes64
open_cb_abort open_cb_cont open_cb_ignore open_cb_invalid open_cb_rescan
- put64 put_endian64
+ put64 put_endian64 put_off64
)
endif()
@@ -44,14 +48,16 @@
#set(gd_sources ${GD_DIR}/test/close.c ${GD_DIR}/test/alter_multiply.c)
-add_definitions(-D__TEST__=\"${CMAKE_BINARY_DIR}/\")
+set(__TEST__ "-D__TEST__=\"${CMAKE_BINARY_DIR}/\"")
+STRING(REGEX REPLACE "/" "\\\\\\\\\\\\" __TEST__ ${__TEST__})
+add_definitions(${__TEST__})
foreach(_test ${gd_sources})
get_filename_component(testname ${_test} NAME_WE)
set(testname test_${testname})
add_executable(${testname} ${_test})
target_link_libraries(${testname} getdata)
- add_test(${testname} ${testname})
+ add_test(NAME ${testname} COMMAND ${testname})
endforeach()
Modified: trunk/getdata/src/internal.h
===================================================================
--- trunk/getdata/src/internal.h 2011-03-17 01:48:56 UTC (rev 517)
+++ trunk/getdata/src/internal.h 2011-03-17 22:43:24 UTC (rev 518)
@@ -290,6 +290,8 @@
#if HAVE_STRUCT_STAT64
typedef struct stat64 gd_stat64_t;
+#elif HAVE_STRUCT__STAT64
+typedef struct _stat64 gd_stat64_t;
#elif HAVE_STRUCT___STAT64
typedef struct __stat64 gd_stat64_t;
#else
Modified: trunk/getdata/test/move_subdir.c
===================================================================
--- trunk/getdata/test/move_subdir.c 2011-03-17 01:48:56 UTC (rev 517)
+++ trunk/getdata/test/move_subdir.c 2011-03-17 22:43:24 UTC (rev 518)
@@ -24,6 +24,10 @@
DIRFILE *D;
mkdir(filedir, 0777);
+ // when using msvc the macro mkdir removes dirfile
+#ifdef mkdir
+#undef mkdir
+#endif
mkdir(subdir, 0777);
fd = open(format, O_CREAT | O_EXCL | O_WRONLY, 0666);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ket...@us...> - 2011-03-17 01:49:04
|
Revision: 517
http://getdata.svn.sourceforge.net/getdata/?rev=517&view=rev
Author: ketiltrout
Date: 2011-03-17 01:48:56 +0000 (Thu, 17 Mar 2011)
Log Message:
-----------
* Converted getdata.h.in from an AC_CONFIG_HEADER to an AC_CONFIG_FILE to give
cmake a hope of properly generating it. But then run the output back through
config.status as a header to get the benefit of the diff check. This is needed
to use autoconf with MinGW under MSys. CMakeLists.txt updated to properly
generate getdata.h for kst2.
* Look for _strto[u]int64 to use under MSVCRT as a replacement for _strto[u]ll.
Modified Paths:
--------------
branches/getdata-0.7/ChangeLog
branches/getdata-0.7/cmake/CMakeLists.txt
branches/getdata-0.7/configure.ac
branches/getdata-0.7/src/getdata.h.in
branches/getdata-0.7/src/internal.h
branches/getdata-0.7/src/msvc/inttypes.h
branches/getdata-0.7/src/parse.c
branches/getdata-0.7/test/parse_include_absolute.c
branches/getdata-0.7/test/parse_include_absrel.c
branches/getdata-0.7/test/parse_include_relabs.c
Property Changed:
----------------
branches/getdata-0.7/cmake/
branches/getdata-0.7/cmake/bindings/
branches/getdata-0.7/cmake/bindings/cxx/
branches/getdata-0.7/cmake/src/
branches/getdata-0.7/src/
Modified: branches/getdata-0.7/ChangeLog
===================================================================
--- branches/getdata-0.7/ChangeLog 2011-03-16 21:20:43 UTC (rev 516)
+++ branches/getdata-0.7/ChangeLog 2011-03-17 01:48:56 UTC (rev 517)
@@ -1,3 +1,20 @@
+2011-03-17 D. V. Wiebe <ge...@ke...> svn:517
+ * src/getdata.h.in: Replace #undefs with @DEFINE_...@ tokens. Define
+ gd_off64_t instead of polluting the namespace. Remove MSCRT specal casing
+ for the gd_*int*_t types.
+ * configure.ac: Update for changes to getdata.h.in. Run getdata.h.in
+ through config.status twice, first as an AC_CONFIG_FILE to replace all the
+ @DEFINE...@s, second as an AC_CONFIG_HEADER as a NOP, just to get the change
+ check.
+ * cmake/CMakeLists.txt: Add DEFINE_... variables.
+
+ * configure.ac: Check for _strtoi64() and _strtoui64()
+ * src/internal.h: Use MSCRT's _strto[u]i64 for strto[u]ll when found.
+ * cmake/CMakeLists.txt: Add -DHAVE__STRTOI64 -DHAVE__STRTOUI64
+
+ * test/parse_include_absrel.c test/parse_include_relabs.c
+ test/parse_include_absolute.c: Free cwd.
+
2011-03-16 D. V. Wiebe <ge...@ke...> svn:516
* configure.ac: check for "slimdata" in addition to "slim", which is what
the binary is called under Fedora.
Property changes on: branches/getdata-0.7/cmake
___________________________________________________________________
Added: svn:ignore
+ getdata.h
CMakeCache.txt
CMakeFiles
cmake_install.cmake
lib
Makefile
Modified: branches/getdata-0.7/cmake/CMakeLists.txt
===================================================================
--- branches/getdata-0.7/cmake/CMakeLists.txt 2011-03-16 21:20:43 UTC (rev 516)
+++ branches/getdata-0.7/cmake/CMakeLists.txt 2011-03-17 01:48:56 UTC (rev 517)
@@ -25,10 +25,22 @@
#TODO add configure
add_definitions(
-DPACKAGE_NAME=\"GetData\"
- -DPACKAGE_VERSION=\"0.7\"
- -DPACKAGE_BUGREPORT=\"www\")
+ -DPACKAGE_VERSION=\"0.7.2\"
+ -DPACKAGE_BUGREPORT=\"get...@li...\")
+## Substitutions needed to build getdata.h
+# build in ANSI C mode
+set(DEFINE_GD_NO_C99_API "#define GD_NO_C99_API")
+# kst2 doesn't need the legacy API
+set(DEFINE_GD_LEGACY_API "/* #undef GD_LEGACY_API */")
+
+# MSVCRT integer types
+set(DEFINE_gd_int16_t "#define gd_int16_t short int")
+set(DEFINE_gd_uint16_t "#define gd_int16_t unsigned short int")
+set(DEFINE_gd_int64_t "#define gd_int64_t __int64")
+
+
if(MSVC)
add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS)
add_definitions(
@@ -43,7 +55,8 @@
-DHAVE_STRUCT__STAT64
-DHAVE__STAT64
-DHAVE__COMMIT
- -DGD_NO_C99_API
+ -DHAVE__STRTOI64
+ -DHAVE__STRTOUI64
)
set(CMAKE_DEBUG_POSTFIX d)
@@ -70,6 +83,8 @@
-DHAVE_DIRENT_H
-DHAVE__COMMIT
-DHAVE__STAT64
+ -DHAVE__STRTOI64
+ -DHAVE__STRTOUI64
-DHAVE_STRUCT___STAT64
-DMKDIR_NO_MODE
)
Property changes on: branches/getdata-0.7/cmake/bindings
___________________________________________________________________
Added: svn:ignore
+ CMakeFiles
cmake_install.cmake
Makefile
Property changes on: branches/getdata-0.7/cmake/bindings/cxx
___________________________________________________________________
Added: svn:ignore
+ CMakeFiles
cmake_install.cmake
Makefile
Property changes on: branches/getdata-0.7/cmake/src
___________________________________________________________________
Added: svn:ignore
+ CMakeFiles
cmake_install.cmake
Makefile
Modified: branches/getdata-0.7/configure.ac
===================================================================
--- branches/getdata-0.7/configure.ac 2011-03-16 21:20:43 UTC (rev 516)
+++ branches/getdata-0.7/configure.ac 2011-03-17 01:48:56 UTC (rev 517)
@@ -63,7 +63,7 @@
dnl Legacy API
AC_ARG_ENABLE(legacy-api, AS_HELP_STRING([--disable-legacy-api],
- [don't include the legacy API wrapper in the library]),
+ [don't include the legacy API wrapper in the library]), dnl'
[
case "${enableval}" in
no) include_legacy_api="no" ;;
@@ -74,8 +74,11 @@
AC_MSG_RESULT([$include_legacy_api])
if test "x$include_legacy_api" != "xno"; then
- AC_DEFINE([GD_LEGACY_API], [], [ This symbol is defined whenever the library contains the legacy API ])
+ DEFINE_GD_LEGACY_API="#define GD_LEGACY_API"
+else
+ DEFINE_GD_LEGACY_API="/* #undef GD_LEGACY_API */"
fi
+AC_SUBST([DEFINE_GD_LEGACY_API])
dnl debugging
AC_ARG_ENABLE(assert, AS_HELP_STRING([--enable-assert],
@@ -297,9 +300,11 @@
fi
fi
if test "x$disable_c99" = "xyes"; then
- AC_DEFINE([GD_NO_C99_API], [1],
- [define to disable C99-specific code in the library source])
+ DEFINE_GD_NO_C99_API="#define GD_NO_C99_API"
+else
+ DEFINE_GD_NO_C99_API="/* #undef GD_NO_C99_API */"
fi
+AC_SUBST([DEFINE_GD_NO_C99_API])
AC_HEADER_STDC
if test "x$make_cxxbindings" != "xno"; then
@@ -508,7 +513,8 @@
dnl functions
AC_CHECK_FUNCS([_commit fchmod _fdopen fseeko fseeko64 fsync ftello ftello64 \
getdelim gmtime_r _lseeki64 _mkdir mkstemp nan _open _read \
- _rmdir stat64 _stat64 strtoll strtoull _unlink _write])
+ _rmdir stat64 _stat64 _strtoi64 strtoll _strtoui64 strtoull \
+ _unlink _write])
if test "x$disable_c99" = "xno"; then
AC_CHECK_FUNCS([cabs])
fi
@@ -659,12 +665,12 @@
gd_int64_t="long long int"
fi
-AC_DEFINE_UNQUOTED([_gd_int16_t], [$gd_int16_t],
- [ Define to a signed 16-bit integer type ])
-AC_DEFINE_UNQUOTED([_gd_uint16_t], [$gd_uint16_t],
- [ Define to an unsigned 16-bit integer type ])
-AC_DEFINE_UNQUOTED([_gd_int64_t], [$gd_int64_t],
- [ Define to a signed 64-bit integer type ])
+DEFINE_gd_int16_t="#define gd_int16_t $gd_int16_t";
+DEFINE_gd_uint16_t="#define gd_uint16_t $gd_uint16_t";
+DEFINE_gd_int64_t="#define gd_int64_t $gd_int64_t";
+AC_SUBST([DEFINE_gd_int16_t])
+AC_SUBST([DEFINE_gd_uint16_t])
+AC_SUBST([DEFINE_gd_int64_t])
dnl python
if test "x$make_pybindings" = "xyes"; then
@@ -774,7 +780,10 @@
AC_CONFIG_FILES([man/gd_alter_endianness.3])
AC_CONFIG_FILES([man/gd_alter_frameoffset.3])
AC_CONFIG_FILES([src/Makefile])
-AC_CONFIG_HEADERS([src/getdata.h], [chmod a-w src/getdata.h])
+dnl This doubling allows us to build getdata.h as a normal AC_CONFIG_FILE, but use
+dnl AC_CONFIG_HEADERS to check whether it has changed.
+AC_CONFIG_FILES([src/getdata.ah:src/getdata.h.in])
+AC_CONFIG_HEADERS([src/getdata.h:src/getdata.ah], [chmod a-w src/getdata.h])
AC_CONFIG_FILES([src/getdata.pc])
AC_CONFIG_FILES([test/Makefile])
AC_CONFIG_FILES([util/Makefile])
Property changes on: branches/getdata-0.7/src
___________________________________________________________________
Modified: svn:ignore
- .deps
.libs
config.h
config.h.in
getdata.h
getdata.pc
stamp-h*
Makefile
Makefile.in
*.lo
*.la
*.swp
+ .deps
.libs
config.h
config.h.in
getdata.h
getdata.pc
stamp-h*
Makefile
Makefile.in
*.lo
*.la
*.swp
getdata.ah
Modified: branches/getdata-0.7/src/getdata.h.in
===================================================================
--- branches/getdata-0.7/src/getdata.h.in 2011-03-16 21:20:43 UTC (rev 516)
+++ branches/getdata-0.7/src/getdata.h.in 2011-03-17 01:48:56 UTC (rev 517)
@@ -1,6 +1,6 @@
/* Copyright (C) 2002-2005 C. Barth Netterfield
* Copyright (C) 2003-2005 Theodore Kisner
- * Copyright (C) 2005-2010 D. V. Wiebe
+ * Copyright (C) 2005-2011 D. V. Wiebe
*
***************************************************************************
*
@@ -56,7 +56,7 @@
#include <sys/types.h>
/* If this symbol is defined here, the C99-API is not present in the library */
-#undef GD_NO_C99_API /**/
+@DEFINE_GD_NO_C99_API@
#if defined(GD_NO_C99_API) && ! defined(GD_C89_API)
# define GD_C89_API
@@ -227,15 +227,9 @@
/* GD_NO_ENTRY is not part of this count */
#define GD_N_ENTYPES 14
-#if defined(__MINGW32__) || defined(_MSC_VER)
-typedef short _gd_int16_t;
-typedef unsigned short _gd_uint16_t;
-typedef __int64 _gd_int64_t;
-#else
-#undef _gd_int16_t /**/
-#undef _gd_uint16_t /**/
-#undef _gd_int64_t /**/
-#endif
+@DEFINE_gd_int16_t@
+@DEFINE_gd_uint16_t@
+@DEFINE_gd_int64_t@
#if ! defined GD_C89_API
# include <inttypes.h>
@@ -247,9 +241,9 @@
#else
# define GD_DCOMPLEXM(v) double v[2]
# define GD_DCOMPLEXP(v) double *v
-typedef _gd_int16_t gd_bit_t;
-typedef _gd_uint16_t gd_spf_t;
-typedef _gd_int64_t gd_shift_t;
+typedef gd_int16_t gd_bit_t;
+typedef gd_uint16_t gd_spf_t;
+typedef gd_int64_t gd_shift_t;
#endif
/* Data types -- No valid type may set 0x40 */
@@ -893,47 +887,46 @@
#if (defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS == 64) || \
(defined __APPLE__) || (defined __CYGWIN__)
-#define off64_t off_t
+#define gd_off64_t off_t
+#else
+#define gd_off64_t off64_t
#endif
-extern int gd_alter_frameoffset64(DIRFILE *dirfile, off64_t offset,
+extern int gd_alter_frameoffset64(DIRFILE *dirfile, gd_off64_t offset,
int fragment, int recode) gd_nonnull ((1));
extern size_t gd_getdata64(DIRFILE *dirfile, const char *field_code,
- off64_t first_frame, off64_t first_samp, size_t num_frames, size_t num_samp,
- gd_type_t return_type, void *data) gd_nonnull ((1, 2));
+ gd_off64_t first_frame, gd_off64_t first_samp, size_t num_frames,
+ size_t num_samp, gd_type_t return_type, void *data) gd_nonnull ((1, 2));
extern size_t gd_putdata64(DIRFILE *dirfile, const char *field_code,
- off64_t first_frame, off64_t first_sample, size_t num_frames,
+ gd_off64_t first_frame, gd_off64_t first_sample, size_t num_frames,
size_t num_samples, gd_type_t data_type, const void *data)
gd_nonnull ((1, 2));
-extern off64_t gd_frameoffset64(DIRFILE *dirfile, int fragment) gd_nonnull((1));
+extern gd_off64_t gd_frameoffset64(DIRFILE *dirfile,
+ int fragment) gd_nonnull((1));
extern double gd_framenum_subset64(DIRFILE *dirfile, const char *field_code,
- double value, off64_t field_start, off64_t field_end) gd_nonnull ((1,2));
+ double value, gd_off64_t field_start,
+ gd_off64_t field_end) gd_nonnull ((1,2));
-extern off64_t gd_nframes64(DIRFILE *dirfile) gd_nonnull ((1));
+extern gd_off64_t gd_nframes64(DIRFILE *dirfile) gd_nonnull ((1));
-extern off64_t gd_bof64(DIRFILE *dirfile, const char *field_code) gd_nothrow
+extern gd_off64_t gd_bof64(DIRFILE *dirfile, const char *field_code) gd_nothrow
gd_nonnull ((1,2));
-extern off64_t gd_eof64(DIRFILE *dirfile, const char *field_code)
+extern gd_off64_t gd_eof64(DIRFILE *dirfile, const char *field_code)
gd_nonnull ((1,2));
-
-#if (defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS == 64) || \
- (defined __APPLE__) || (defined __CYGWIN__)
-#undef off64_t /**/
#endif
-#endif
-/* If this symbol is defined here, the legacy API is present in the library */
-#undef GD_LEGACY_API /**/
-
#ifdef __cplusplus
}
#endif
+/* If this symbol is defined here, the legacy API is present in the library */
+@DEFINE_GD_LEGACY_API@
+
/* The caller can disable the legacy API by defining GD_NO_LEGACY_API
* before including getdata.h
*/
Modified: branches/getdata-0.7/src/internal.h
===================================================================
--- branches/getdata-0.7/src/internal.h 2011-03-16 21:20:43 UTC (rev 516)
+++ branches/getdata-0.7/src/internal.h 2011-03-17 01:48:56 UTC (rev 517)
@@ -219,11 +219,19 @@
#endif
#ifndef HAVE_STRTOLL
+# ifdef HAVE__STRTOI64
+# define strtoll _strtoi64
+# else
# define strtoll strtol
+# endif
#endif
#ifndef HAVE_STRTOULL
+# ifdef HAVE__STRTOUI64
+# define strtoull _strtoi64
+# else
# define stroull strtoul
+# endif
#endif
#if defined __MSVCRT__ && defined HAVE__FDOPEN
Modified: branches/getdata-0.7/src/msvc/inttypes.h
===================================================================
--- branches/getdata-0.7/src/msvc/inttypes.h 2011-03-16 21:20:43 UTC (rev 516)
+++ branches/getdata-0.7/src/msvc/inttypes.h 2011-03-17 01:48:56 UTC (rev 517)
@@ -302,6 +302,4 @@
#define wcstoimax _wcstoi64
#define wcstoumax _wcstoui64
-#define strtoull _strtoui64
-
#endif // _MSC_INTTYPES_H_ ]
Modified: branches/getdata-0.7/src/parse.c
===================================================================
--- branches/getdata-0.7/src/parse.c 2011-03-16 21:20:43 UTC (rev 516)
+++ branches/getdata-0.7/src/parse.c 2011-03-17 01:48:56 UTC (rev 517)
@@ -22,7 +22,6 @@
#include "internal.h"
#ifdef STDC_HEADERS
-#include <inttypes.h>
#include <ctype.h>
#include <math.h>
#include <errno.h>
Modified: branches/getdata-0.7/test/parse_include_absolute.c
===================================================================
--- branches/getdata-0.7/test/parse_include_absolute.c 2011-03-16 21:20:43 UTC (rev 516)
+++ branches/getdata-0.7/test/parse_include_absolute.c 2011-03-17 01:48:56 UTC (rev 517)
@@ -52,5 +52,6 @@
rmdir(filedir);
CHECKU(spf, 11);
+ free(cwd);
return r;
}
Modified: branches/getdata-0.7/test/parse_include_absrel.c
===================================================================
--- branches/getdata-0.7/test/parse_include_absrel.c 2011-03-16 21:20:43 UTC (rev 516)
+++ branches/getdata-0.7/test/parse_include_absrel.c 2011-03-17 01:48:56 UTC (rev 517)
@@ -59,5 +59,6 @@
rmdir(filedir);
CHECKU(spf, 11);
+ free(cwd);
return r;
}
Modified: branches/getdata-0.7/test/parse_include_relabs.c
===================================================================
--- branches/getdata-0.7/test/parse_include_relabs.c 2011-03-16 21:20:43 UTC (rev 516)
+++ branches/getdata-0.7/test/parse_include_relabs.c 2011-03-17 01:48:56 UTC (rev 517)
@@ -62,5 +62,6 @@
rmdir(filedir);
CHECKU(spf, 11);
+ free(cwd);
return r;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ket...@us...> - 2011-03-16 21:20:51
|
Revision: 516
http://getdata.svn.sourceforge.net/getdata/?rev=516&view=rev
Author: ketiltrout
Date: 2011-03-16 21:20:43 +0000 (Wed, 16 Mar 2011)
Log Message:
-----------
Check for "slimdata" in addition to "slim", which is what the binary is called under Fedora.
Modified Paths:
--------------
branches/getdata-0.7/ChangeLog
branches/getdata-0.7/configure.ac
branches/getdata-0.7/m4/encoding.m4
Modified: branches/getdata-0.7/ChangeLog
===================================================================
--- branches/getdata-0.7/ChangeLog 2011-03-16 20:35:10 UTC (rev 515)
+++ branches/getdata-0.7/ChangeLog 2011-03-16 21:20:43 UTC (rev 516)
@@ -1,3 +1,9 @@
+2011-03-16 D. V. Wiebe <ge...@ke...> svn:516
+ * configure.ac: check for "slimdata" in addition to "slim", which is what
+ the binary is called under Fedora.
+ * m4/encoding.m4 (GD_CHECK_ENCODING): Handle multiple binary names in $5 and
+ $6.
+
2011-03-16 D. V. Wiebe <ge...@ke...> svn:515
GetData-0.7.2rc1:
Modified: branches/getdata-0.7/configure.ac
===================================================================
--- branches/getdata-0.7/configure.ac 2011-03-16 20:35:10 UTC (rev 515)
+++ branches/getdata-0.7/configure.ac 2011-03-16 21:20:43 UTC (rev 516)
@@ -731,7 +731,7 @@
dnl external encodings
GD_CHECK_ENCODING([bzip2],[bz2],[BZ2_bzReadOpen],[bzlib.h],[bzip2],[bunzip2])
-GD_CHECK_ENCODING([slim],[slim],[slimopen],[slimlib.h],[slim],[unslim],[])
+GD_CHECK_ENCODING([slim],[slim],[slimopen],[slimlib.h],[slim slimdata],[unslim],[])
GD_CHECK_ENCODING([gzip],[z],[gzopen],[zlib.h],[gzip],[gunzip],[])
GD_CHECK_ENCODING([lzma],[lzma],[lzma_auto_decoder],[lzma.h],[xz],[],[])
Modified: branches/getdata-0.7/m4/encoding.m4
===================================================================
--- branches/getdata-0.7/m4/encoding.m4 2011-03-16 20:35:10 UTC (rev 515)
+++ branches/getdata-0.7/m4/encoding.m4 2011-03-16 21:20:43 UTC (rev 516)
@@ -89,19 +89,21 @@
AC_SUBST(AS_TR_CPP([$1_LDFLAGS]))
dnl executables needed for tests
-AC_PATH_PROGS([path_$5], [$5], [not found], [$AS_TR_CPP([$1_SEARCHPATH])])
+m4_define(gd_progname, regexp([$5 ], [^\([^ ]*\) ], [\1]))
+AC_PATH_PROGS([path_]gd_progname, [$5], [not found], [$AS_TR_CPP([$1_SEARCHPATH])])
-if test "x$path_$5" != "xnot found"; then
- AC_DEFINE_UNQUOTED(AS_TR_CPP([$5]), ["$path_$5"],
- [ Define to the full path to the `$5' binary ])
+if test "x$path_[]gd_progname" != "xnot found"; then
+ AC_DEFINE_UNQUOTED(AS_TR_CPP(gd_progname), ["$path_]gd_progname["],
+ [ Define to the full path to the `]gd_progname[' binary ])
fi
ifelse(`x$6', `x',,[
-AC_PATH_PROGS([path_$6], [$6], [not found], [$AS_TR_CPP([$1_SEARCHPATH])])
+m4_define(gd_progname, regexp([$6 ], [^\([^ ]*\) ], [\1]))
+AC_PATH_PROGS([path_]gd_progname, [$6], [not found], [$AS_TR_CPP([$1_SEARCHPATH])])
-if test "x$path_$6" != "xnot found"; then
- AC_DEFINE_UNQUOTED(AS_TR_CPP([$6]), ["$path_$6"],
- [ Define to the full path to the `$6' binary ])
+if test "x$path_[]gd_progname" != "xnot found"; then
+ AC_DEFINE_UNQUOTED(AS_TR_CPP(gd_progname), ["$path_]gd_progname["],
+ [ Define to the full path to the `]gd_progname[' binary ])
fi
$7
])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ket...@us...> - 2011-03-16 20:35:18
|
Revision: 515
http://getdata.svn.sourceforge.net/getdata/?rev=515&view=rev
Author: ketiltrout
Date: 2011-03-16 20:35:10 +0000 (Wed, 16 Mar 2011)
Log Message:
-----------
GetData-0.7.1rc1: some MSVC fixes from Peter via trunk.
Modified Paths:
--------------
branches/getdata-0.7/ChangeLog
branches/getdata-0.7/NEWS
branches/getdata-0.7/cmake/CMakeLists.txt
branches/getdata-0.7/m4/version.m4
branches/getdata-0.7/src/internal.h
branches/getdata-0.7/src/msvc/inttypes.h
branches/getdata-0.7/src/parse.c
Modified: branches/getdata-0.7/ChangeLog
===================================================================
--- branches/getdata-0.7/ChangeLog 2011-03-15 23:08:22 UTC (rev 514)
+++ branches/getdata-0.7/ChangeLog 2011-03-16 20:35:10 UTC (rev 515)
@@ -1,3 +1,12 @@
+2011-03-16 D. V. Wiebe <ge...@ke...> svn:515
+ GetData-0.7.2rc1:
+
+ * src/parse.c (_GD_ParseFieldSpec): Fix GD_E_FORMAT_DUPLICATE error data.
+
+ Merged in changes from trunk, revision 514:
+
+ * src/internal.h: Define S_ISREG and S_ISDIR if missing.
+
2011-03-14 D. V. Wiebe <ge...@ke...> svn:513
* test/parse_include_absolute.c test/parse_include_absrel.c
test/parse_include_relabs.c test/parse_include_relrel.c: Added.
@@ -768,7 +777,7 @@
* src/flimits.c (gd_get_eof gd_get_eof64 _GD_GetEOF): Renamed. Proper INDEX
handling added.
- * src/foffs.c src/flimits.c src/nsamples.c: fofds.c and nsamples.c merged
+ * src/foffs.c src/flimits.c src/nsamples.c: foffs.c and nsamples.c merged
and renamed flimits.c.
2010-06-30 D. V. Wiebe <ge...@ke...> svn:425 svn:426
Modified: branches/getdata-0.7/NEWS
===================================================================
--- branches/getdata-0.7/NEWS 2011-03-15 23:08:22 UTC (rev 514)
+++ branches/getdata-0.7/NEWS 2011-03-16 20:35:10 UTC (rev 515)
@@ -1,3 +1,18 @@
+New in version 0.7.2rc1:
+
+ Library Changes
+
+ * If built with modules, the plugin shared objects will now be installed in
+ a separate directory (by default "${libdir}/getdata", but see the
+ --with-module-dir option in ./configure).
+ * [?MABYE SOMETHING ABOUT MSVC?]
+ * BUG FIX: When using modules, a missing plugin no longer results in a lock up
+ the second time an attempt is made to find it.
+ * BUG FIX: GetData now properly processes /INCLUDE directives with absolute
+ paths, as the documentation insists it should.
+
+|==============================================================================|
+
New in version 0.7.1:
Library Changes
Modified: branches/getdata-0.7/cmake/CMakeLists.txt
===================================================================
--- branches/getdata-0.7/cmake/CMakeLists.txt 2011-03-15 23:08:22 UTC (rev 514)
+++ branches/getdata-0.7/cmake/CMakeLists.txt 2011-03-16 20:35:10 UTC (rev 515)
@@ -42,6 +42,7 @@
-DHAVE_STDINT_H
-DHAVE_STRUCT__STAT64
-DHAVE__STAT64
+ -DHAVE__COMMIT
-DGD_NO_C99_API
)
set(CMAKE_DEBUG_POSTFIX d)
@@ -80,7 +81,7 @@
include_directories(${GD_DIR}/src ${CMAKE_CURRENT_BINARY_DIR})
if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
- set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/INSTALLED)
+ set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/INSTALLED CACHE PATH "install path" FORCE)
endif()
add_subdirectory(src)
Modified: branches/getdata-0.7/m4/version.m4
===================================================================
--- branches/getdata-0.7/m4/version.m4 2011-03-15 23:08:22 UTC (rev 514)
+++ branches/getdata-0.7/m4/version.m4 2011-03-16 20:35:10 UTC (rev 515)
@@ -20,15 +20,15 @@
m4_define(getdata_major, 0)
m4_define(getdata_minor, 7)
-m4_define(getdata_revision, 1)
-m4_define(getdata_extra, [])
+m4_define(getdata_revision, 2)
+m4_define(getdata_extra, [rc1])
m4_define(getdata_version,
getdata_major.getdata_minor.getdata_revision[]getdata_extra)
dnl libgetdata current interface version
m4_define(getdata_iface_version, 4)
dnl libgetdata current interface implementation revision
-m4_define(getdata_iface_revision, 1)
+m4_define(getdata_iface_revision, 2)
dnl libgetdata interface age (current interface - oldest supported interface)
m4_define(getdata_iface_revision, 0)
Modified: branches/getdata-0.7/src/internal.h
===================================================================
--- branches/getdata-0.7/src/internal.h 2011-03-15 23:08:22 UTC (rev 514)
+++ branches/getdata-0.7/src/internal.h 2011-03-16 20:35:10 UTC (rev 515)
@@ -44,6 +44,14 @@
typedef int mode_t;
#endif
+
+#ifdef _MSC_VER
+// missing in sys/stat.h
+#define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
+#define S_ISDIR(m) (((m) & _S_IFMT) == _S_IFDIR)
+#define snprintf _snprintf
+#endif
+
#ifdef __APPLE__
typedef off_t off64_t;
#endif
Modified: branches/getdata-0.7/src/msvc/inttypes.h
===================================================================
--- branches/getdata-0.7/src/msvc/inttypes.h 2011-03-15 23:08:22 UTC (rev 514)
+++ branches/getdata-0.7/src/msvc/inttypes.h 2011-03-16 20:35:10 UTC (rev 515)
@@ -297,9 +297,11 @@
#define strtoimax _strtoi64
#define strtoumax _strtoui64
+
// 7.8.2.4 The wcstoimax and wcstoumax functions
#define wcstoimax _wcstoi64
#define wcstoumax _wcstoui64
+#define strtoull _strtoui64
#endif // _MSC_INTTYPES_H_ ]
Modified: branches/getdata-0.7/src/parse.c
===================================================================
--- branches/getdata-0.7/src/parse.c 2011-03-15 23:08:22 UTC (rev 514)
+++ branches/getdata-0.7/src/parse.c 2011-03-16 20:35:10 UTC (rev 515)
@@ -22,6 +22,7 @@
#include "internal.h"
#ifdef STDC_HEADERS
+#include <inttypes.h>
#include <ctype.h>
#include <math.h>
#include <errno.h>
@@ -1410,7 +1411,7 @@
if (Q) {
if (~flags & GD_IGNORE_DUPS)
_GD_SetError(D, GD_E_FORMAT, GD_E_FORMAT_DUPLICATE, format_file,
- linenum, D->fragment[Q->fragment_index].cname);
+ linenum, E->field);
_GD_FreeE(E, 1);
dreturn("%p", NULL);
return NULL;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <syn...@us...> - 2011-03-15 23:08:28
|
Revision: 514
http://getdata.svn.sourceforge.net/getdata/?rev=514&view=rev
Author: syntheticpp
Date: 2011-03-15 23:08:22 +0000 (Tue, 15 Mar 2011)
Log Message:
-----------
link with msvc build of kst
Modified Paths:
--------------
trunk/getdata/cmake/CMakeLists.txt
trunk/getdata/src/internal.h
trunk/getdata/src/msvc/inttypes.h
trunk/getdata/src/parse.c
Modified: trunk/getdata/cmake/CMakeLists.txt
===================================================================
--- trunk/getdata/cmake/CMakeLists.txt 2011-03-15 03:03:52 UTC (rev 513)
+++ trunk/getdata/cmake/CMakeLists.txt 2011-03-15 23:08:22 UTC (rev 514)
@@ -42,6 +42,7 @@
-DHAVE_STDINT_H
-DHAVE_STRUCT__STAT64
-DHAVE__STAT64
+ -DHAVE__COMMIT
-DGD_NO_C99_API
)
set(CMAKE_DEBUG_POSTFIX d)
@@ -80,7 +81,7 @@
include_directories(${GD_DIR}/src ${CMAKE_CURRENT_BINARY_DIR})
if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
- set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/INSTALLED)
+ set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/INSTALLED CACHE PATH "install path" FORCE)
endif()
add_subdirectory(src)
Modified: trunk/getdata/src/internal.h
===================================================================
--- trunk/getdata/src/internal.h 2011-03-15 03:03:52 UTC (rev 513)
+++ trunk/getdata/src/internal.h 2011-03-15 23:08:22 UTC (rev 514)
@@ -44,6 +44,14 @@
typedef int mode_t;
#endif
+
+#ifdef _MSC_VER
+// missing in sys/stat.h
+#define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
+#define S_ISDIR(m) (((m) & _S_IFMT) == _S_IFDIR)
+#define snprintf _snprintf
+#endif
+
#ifdef __APPLE__
typedef off_t off64_t;
#endif
Modified: trunk/getdata/src/msvc/inttypes.h
===================================================================
--- trunk/getdata/src/msvc/inttypes.h 2011-03-15 03:03:52 UTC (rev 513)
+++ trunk/getdata/src/msvc/inttypes.h 2011-03-15 23:08:22 UTC (rev 514)
@@ -297,9 +297,11 @@
#define strtoimax _strtoi64
#define strtoumax _strtoui64
+
// 7.8.2.4 The wcstoimax and wcstoumax functions
#define wcstoimax _wcstoi64
#define wcstoumax _wcstoui64
+#define strtoull _strtoui64
#endif // _MSC_INTTYPES_H_ ]
Modified: trunk/getdata/src/parse.c
===================================================================
--- trunk/getdata/src/parse.c 2011-03-15 03:03:52 UTC (rev 513)
+++ trunk/getdata/src/parse.c 2011-03-15 23:08:22 UTC (rev 514)
@@ -22,6 +22,7 @@
#include "internal.h"
#ifdef STDC_HEADERS
+#include <inttypes.h>
#include <ctype.h>
#include <math.h>
#include <errno.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ket...@us...> - 2011-03-15 03:03:59
|
Revision: 513
http://getdata.svn.sourceforge.net/getdata/?rev=513&view=rev
Author: ketiltrout
Date: 2011-03-15 03:03:52 +0000 (Tue, 15 Mar 2011)
Log Message:
-----------
As reported by Matt, per the documentation, handle absolute paths in /INCLUDE
directives.
Modified Paths:
--------------
branches/getdata-0.7/ChangeLog
branches/getdata-0.7/src/add.c
branches/getdata-0.7/src/include.c
branches/getdata-0.7/src/move.c
branches/getdata-0.7/src/name.c
branches/getdata-0.7/src/parse.c
branches/getdata-0.7/test/Makefile.am
branches/getdata-0.7/test/move_data_endian.c
Added Paths:
-----------
branches/getdata-0.7/test/parse_include_absolute.c
branches/getdata-0.7/test/parse_include_absrel.c
branches/getdata-0.7/test/parse_include_relabs.c
branches/getdata-0.7/test/parse_include_relrel.c
Property Changed:
----------------
branches/getdata-0.7/test/
Modified: branches/getdata-0.7/ChangeLog
===================================================================
--- branches/getdata-0.7/ChangeLog 2011-03-14 21:55:32 UTC (rev 512)
+++ branches/getdata-0.7/ChangeLog 2011-03-15 03:03:52 UTC (rev 513)
@@ -1,3 +1,13 @@
+2011-03-14 D. V. Wiebe <ge...@ke...> svn:513
+ * test/parse_include_absolute.c test/parse_include_absrel.c
+ test/parse_include_relabs.c test/parse_include_relrel.c: Added.
+
+ * src/include.c (_GD_Include): Handle absolute paths in /INCLUDE directives.
+ The sname now contains D->name when appropriate.
+ * src/add.c (_GD_Add) src/parse.c (_GD_ParseRaw) src/move.c (gd_move): Fix
+ computation of filebase for new sname.
+
+
2011-03-03 D. V. Wiebe <ge...@ke...> svn:510
* m4/idl.m4: Munge IDL_LIBS to convert "-m <arg>" into "-m<arg>" since
libtool seems to delete <arg> if that's not the case.
@@ -61,7 +71,7 @@
* src/internal.h: Conditionalise inclusion of non-ANSI unistd.h and stdint.h.
Various _MSC_VER specific code. Also, define gd_stat64 and gd_stat64_t to
- plausibly useful things by default.o
+ plausibly useful things by default.
* src/getdata.h.in: Remove unistd.h. Add math.h and some _MSC_VER specific
code. (There are still unresolved MSVC issues with this file.)
Modified: branches/getdata-0.7/src/add.c
===================================================================
--- branches/getdata-0.7/src/add.c 2011-03-14 21:55:32 UTC (rev 512)
+++ branches/getdata-0.7/src/add.c 2011-03-15 03:03:52 UTC (rev 513)
@@ -195,12 +195,9 @@
break;
}
- if (D->fragment[E->fragment_index].sname)
- snprintf(E->e->u.raw.filebase, FILENAME_MAX, "%s/%s/%s", D->name,
- D->fragment[E->fragment_index].sname, E->field);
- else
- snprintf(E->e->u.raw.filebase, FILENAME_MAX, "%s/%s", D->name,
- E->field);
+ snprintf(E->e->u.raw.filebase, FILENAME_MAX, "%s/%s",
+ D->fragment[E->fragment_index].sname ?
+ D->fragment[E->fragment_index].sname : D->name, E->field);
if ((E->EN(raw,spf) = entry->EN(raw,spf)) == 0)
_GD_SetError(D, GD_E_BAD_ENTRY, GD_E_BAD_ENTRY_SPF, NULL,
Modified: branches/getdata-0.7/src/include.c
===================================================================
--- branches/getdata-0.7/src/include.c 2011-03-14 21:55:32 UTC (rev 512)
+++ branches/getdata-0.7/src/include.c 2011-03-15 03:03:52 UTC (rev 513)
@@ -39,6 +39,8 @@
int linenum, char** ref_name, int me, int* standards, unsigned long *flags)
{
int i;
+ int abs = 0;
+ int sname_null_ok = 0;
int found = 0;
char temp_buf1[FILENAME_MAX];
char temp_buf2[FILENAME_MAX];
@@ -49,11 +51,13 @@
ref_name, linenum, me, standards, flags);
/* create the format filename */
- if (D->fragment[me].sname)
- snprintf(temp_buf1, FILENAME_MAX, "%s/%s/%s", D->name,
- D->fragment[me].sname, ename);
- else
- snprintf(temp_buf1, FILENAME_MAX, "%s/%s", D->name, ename);
+ if (ename[0] == '/') {
+ strncpy(temp_buf1, ename, FILENAME_MAX - 1);
+ temp_buf1[FILENAME_MAX - 1] = '\0';
+ abs = 1;
+ } else
+ snprintf(temp_buf1, FILENAME_MAX, "%s/%s", D->fragment[me].sname ?
+ D->fragment[me].sname : D->name, ename);
/* Run through the include list to see if we've already included this
* file */
@@ -129,24 +133,32 @@
/* extract the subdirectory name - dirname both returns a volatile string
* and modifies its argument, ergo strcpy */
strncpy(temp_buf1, ename, FILENAME_MAX);
- if (D->fragment[me].sname)
- snprintf(temp_buf2, FILENAME_MAX, "%s/%s", D->fragment[me].sname,
- dirname(temp_buf1));
- else
+ if (abs)
+ D->fragment[D->n_fragment - 1].sname = strdup(dirname(temp_buf1));
+ else {
strcpy(temp_buf2, dirname(temp_buf1));
-
- if (temp_buf2[0] == '.' && temp_buf2[1] == '\0')
- D->fragment[D->n_fragment - 1].sname = NULL;
- else {
- D->fragment[D->n_fragment - 1].sname = strdup(temp_buf2);
-
- if (D->fragment[D->n_fragment - 1].sname == NULL) {
- _GD_SetError(D, GD_E_ALLOC, 0, NULL, 0, NULL);
- dreturn("%i", -1);
- return -1;
+ if (temp_buf2[0] == '.' && temp_buf2[1] == '\0') {
+ if (D->fragment[me].sname)
+ D->fragment[D->n_fragment - 1].sname = strdup(D->fragment[me].sname);
+ else {
+ D->fragment[D->n_fragment - 1].sname = NULL;
+ sname_null_ok = 1;
+ }
+ } else {
+ strncpy(temp_buf1, ename, FILENAME_MAX);
+ snprintf(temp_buf2, FILENAME_MAX, "%s/%s", D->fragment[me].sname ?
+ D->fragment[me].sname : D->name, dirname(temp_buf1));
+ D->fragment[D->n_fragment - 1].sname = strdup(temp_buf2);
}
}
+ if (!sname_null_ok && D->fragment[D->n_fragment - 1].sname == NULL) {
+ _GD_SetError(D, GD_E_ALLOC, 0, NULL, 0, NULL);
+ dreturn("%i", -1);
+ return -1;
+ }
+ dwatch("%s", D->fragment[D->n_fragment - 1].sname);
+
*ref_name = _GD_ParseFragment(new_fp, D, D->n_fragment - 1, standards, flags);
fclose(new_fp);
Modified: branches/getdata-0.7/src/move.c
===================================================================
--- branches/getdata-0.7/src/move.c 2011-03-14 21:55:32 UTC (rev 512)
+++ branches/getdata-0.7/src/move.c 2011-03-15 03:03:52 UTC (rev 513)
@@ -395,11 +395,9 @@
return -1;
}
- if (D->fragment[new_fragment].sname)
- snprintf(new_filebase, FILENAME_MAX, "%s/%s/%s", D->name,
- D->fragment[new_fragment].sname, E->field);
- else
- snprintf(new_filebase, FILENAME_MAX, "%s/%s", D->name, E->field);
+ snprintf(new_filebase, FILENAME_MAX, "%s/%s",
+ D->fragment[new_fragment].sname ? D->fragment[new_fragment].sname :
+ D->name, E->field);
if (_GD_MogrifyFile(D, E, D->fragment[new_fragment].encoding,
D->fragment[new_fragment].byte_sex,
Modified: branches/getdata-0.7/src/name.c
===================================================================
--- branches/getdata-0.7/src/name.c 2011-03-14 21:55:32 UTC (rev 512)
+++ branches/getdata-0.7/src/name.c 2011-03-15 03:03:52 UTC (rev 513)
@@ -180,11 +180,9 @@
return -1;
}
- if (D->fragment[E->fragment_index].sname)
- snprintf(filebase, FILENAME_MAX, "%s/%s/%s", D->name,
- D->fragment[E->fragment_index].sname, new_name);
- else
- snprintf(filebase, FILENAME_MAX, "%s/%s", D->name, new_name);
+ snprintf(filebase, FILENAME_MAX, "%s/%s",
+ D->fragment[E->fragment_index].sname ?
+ D->fragment[E->fragment_index].sname : D->name, new_name);
/* Close the old file */
if (E->e->u.raw.file->fp != -1 &&
Modified: branches/getdata-0.7/src/parse.c
===================================================================
--- branches/getdata-0.7/src/parse.c 2011-03-14 21:55:32 UTC (rev 512)
+++ branches/getdata-0.7/src/parse.c 2011-03-15 03:03:52 UTC (rev 513)
@@ -275,11 +275,8 @@
return NULL;
}
- if (D->fragment[me].sname)
- snprintf(E->e->u.raw.filebase, FILENAME_MAX, "%s/%s/%s", D->name,
- D->fragment[me].sname, in_cols[0]);
- else
- snprintf(E->e->u.raw.filebase, FILENAME_MAX, "%s/%s", D->name, in_cols[0]);
+ snprintf(E->e->u.raw.filebase, FILENAME_MAX, "%s/%s", D->fragment[me].sname ?
+ D->fragment[me].sname : D->name, in_cols[0]);
E->EN(raw,data_type) = _GD_RawType(in_cols[2], standards, pedantic);
E->e->u.raw.size = GD_SIZE(E->EN(raw,data_type));
Property changes on: branches/getdata-0.7/test
___________________________________________________________________
Modified: svn:ignore
- Makefile
Makefile.in
*.o
*.odirfile
*.swp
*.exe
.deps
.libs
convert_uint8_int8
convert_uint8_uint16
convert_uint8_int16
convert_uint8_uint32
convert_uint8_int32
convert_uint8_float32
convert_uint8_uint64
convert_uint8_int64
convert_uint8_float64
convert_int8_uint8
convert_int8_uint16
convert_int8_int16
convert_int8_uint32
convert_int8_int32
convert_int8_float32
convert_int8_uint64
convert_int8_int64
convert_int8_float64
convert_uint16_uint8
convert_uint16_int8
convert_uint16_int16
convert_uint16_uint32
convert_uint16_int32
convert_uint16_float32
convert_uint16_uint64
convert_uint16_int64
convert_uint16_float64
convert_int16_uint8
convert_int16_int8
convert_int16_uint16
convert_int16_uint32
convert_int16_int32
convert_int16_float32
convert_int16_uint64
convert_int16_int64
convert_int16_float64
convert_uint32_uint8
convert_uint32_int8
convert_uint32_uint16
convert_uint32_int16
convert_uint32_int32
convert_uint32_float32
convert_uint32_uint64
convert_uint32_int64
convert_uint32_float64
convert_int32_uint8
convert_int32_int8
convert_int32_uint16
convert_int32_int16
convert_int32_uint32
convert_int32_float32
convert_int32_uint64
convert_int32_int64
convert_int32_float64
convert_uint64_uint8
convert_uint64_int8
convert_uint64_uint16
convert_uint64_int16
convert_uint64_uint32
convert_uint64_int32
convert_uint64_float32
convert_uint64_int64
convert_uint64_float64
convert_int64_uint8
convert_int64_int8
convert_int64_uint16
convert_int64_int16
convert_int64_uint32
convert_int64_int32
convert_int64_float32
convert_int64_uint64
convert_int64_float64
convert_float32_uint8
convert_float32_int8
convert_float32_uint16
convert_float32_int16
convert_float32_uint32
convert_float32_int32
convert_float32_uint64
convert_float32_int64
convert_float32_float64
convert_float64_uint8
convert_float64_int8
convert_float64_uint16
convert_float64_int16
convert_float64_uint32
convert_float64_int32
convert_float64_float32
convert_float64_uint64
convert_float64_int64
creat
creat_excl
creat_rdonly
flist
flist_invalid
get64
get_bad_code
get_bit
get_char
get_endian8
get_endian16
get_endian32
get_endian64
get_endian_float32_big
get_endian_float32_arm
get_endian_float32_little
get_endian_float64_big
get_endian_float64_arm
get_endian_float64_little
get_ff
get_float32
get_float64
get_foffs
get_fs
get_int8
get_int16
get_int32
get_int64
get_invalid
get_lincom1
get_lincom2
get_lincom3
get_lincom_noin
get_linterp
get_linterp_noin
get_linterp_notab
get_multiply
get_multiply_noin
get_nonexistent
get_null
get_off64
get_phase
get_recurse
get_sf
get_ss
get_type
get_uint16
get_uint32
get_uint64
legacy_get
legacy_nframes
legacy_nonexistent
legacy_put
legacy_spf
nfields
nfields_invalid
nframes
nframes64
nframes_empty
nframes_invalid
nframes_off64
nframes_spf
open
open_eaccess
open_nonexistent
open_notdirfile
parse_badline
parse_bit
parse_bit4
parse_bit_bitnum
parse_bit_bitsize
parse_bit_ncols
parse_bit_numbits
parse_endian_bad
parse_endian_big
parse_endian_force
parse_endian_little
parse_foffs
parse_include
parse_include_nonexistent
parse_index
parse_lincom
parse_lincom_ncols1
parse_lincom_ncols2
parse_lincom_nfields
parse_lincom_nofields
parse_linterp
parse_linterp_ncols
parse_multiply
parse_multiply_ncols
parse_ncols
parse_phase
parse_phase_ncols
parse_raw
parse_raw_char
parse_raw_ncols
parse_raw_spf
parse_raw_type
parse_version
parse_version_include
put64
put_bad_code
put_bit
put_bof
put_char
put_endian8
put_endian16
put_endian32
put_endian64
put_endian_float32_arm
put_endian_float32_big
put_endian_float32_little
put_endian_float64_arm
put_endian_float64_big
put_endian_float64_little
put_ff
put_float32
put_float64
put_foffs
put_fs
put_int8
put_int16
put_int32
put_int64
put_invalid
put_lincom1
put_lincom2
put_lincom_noin
put_linterp
put_linterp_notab
put_multiply
put_null
put_off64
put_phase
put_phase_noin
put_rdonly
put_recurse
put_rofs
put_sf
put_ss
put_type
put_uint16
put_uint32
put_uint64
spf
spf_lincom
spf_multiply
spf_recurse
trunc
trunc_rdonly
trunc_rofs
flush_invalid
parse_version_slash
flush_all
flush
close_null
close
parse_endian_slash
error_error
parse_name
parse_include_slash
close_bad
parse_foffs_slash
flush_bad_code
dfes_bit
dfes_lincom
dfes_linterp
dfes_multiply
dfes_null
dfes_phase
dfes_raw
dfes_zero
entry_bad_code
entry_bit
entry_invalid
entry_lincom
entry_linterp
entry_multiply
entry_phase
entry_raw
legacy_get_put
legacy_get_rofs
add_phase
add_lincom_nfields
add_raw
add_multiply
add_bit_bitsize
flush_meta
add_type
add_raw_type
add_bit_bitnum
add_bit
add_format
add_raw_spf
put_linterp_noin
error_short
error
add
add_linterp
nfragments
add_duplicate
add_code
add_bit_numbits
add_lincom
add_rdonly
ascii_get
ascii_put
ascii_nframes
slim_get
slim_nframes
slim_put
add_many
add_sort
nfields_type
nfields_type_invalid
nmeta
nmeta_invalid
nmeta_parent
nmeta_type
nmeta_type_invalid
nmeta_type_parent
nmeta_vectors
nmeta_vectors_invalid
nmeta_vectors_parent
nvectors
nvectors_invalid
parse_const
parse_const_ncols
parse_duplicate
parse_meta
parse_meta_parent
parse_meta_raw
parse_quote
parse_sort
parse_string
parse_string_ncols
parse_whitespace
madd_linterp_invalid
madd_lincom_invalid
vlist_invalid
vlist_meta
add_raw_invalid
cvlist_invalid
svlist_invalid
cvlist
svlist
madd_phase_invalid
add_invalid
madd_phase
add_phase_invalid
add_spec_directive
add_string
add_linterp_invalid
madd_multiply
flist_type_invalid
clist
cvlist_meta_invalid
flist_meta_invalid
flist_type
svlist_meta_invalid
cvlist_meta
vlist_meta_invalid
svlist_meta
parse_string_null
madd_linterp
madd_lincom
vlist
add_bit_invalid
add_lincom_invalid
madd_bit_invalid
madd_bit
add_multiply_invalid
add_const
madd_multiply_invalid
madd
add_spec_invalid
flist_type_meta_invalid
add_spec
flist_type_meta
flist_meta
parse_meta_index
entry_raw_scalar_code
parse_bit_scalar
entry_raw_scalar_type
entry_lincom_scalar
entry_phase_scalar
entry_raw_scalar
parse_lincom_scalar
entry_bit_scalar
parse_raw_scalar
parse_phase_scalar
include
include_nonexistent
include_creat
include_invalid
include_accmode
include_index
madd_spec_directive
madd_spec_invalid
madd_spec
parse_quote_mismatch
parse_eol
parse_foffs_include
put_string
parse_protect_data
put_const
put_string_protect
ref
put_const_protect
parse_protect_all
ref_none
parse_ref
add_protect
parse_protect_format
parse_protect_bad
ref_two
put_protect
include_rdonly
parse_ref_nonexistent
parse_protect_none
parse_name_pedantic
parse_name_dot
parse_name_ext
parse_duplicate_ignore
gzip_get
gzip_nframes
gzip_put
gzip_get_get
bzip_get
bzip_nframes
bzip_put
bzip_get_get
global_name
open_cb_abort
open_cb_cont
open_cb_ignore
open_cb_rescan
open_cb_invalid
del_const_force
del_const
del_derived_force
del_const_deref
del_meta_force
del_data
del_meta
del
del_derived
close_discard
global_ref_set
global_ref_empty
include_ignore
global_ref
include_ref
include_auto
move
move_index
move_protect
move_data_enc_ar
bzip_move_from
gzip_move_from
move_data_foffs
move_data_enc_ra
move_data_endian
move_data_nop
alter_multiply
alter_bit_bitnum
alter_entry_recode
alter_linterp_move
alter_raw_spf
alter_entry
alter_bit_numbits
alter_lincom_slope
alter_raw_type
alter_lincom_input
alter_const
alter_phase
alter_lincom_offset
alter_linterp
foffs_get
foffs_move
foffs_alter
endian_alter
endian_move
endian_get
encode_alter
encode_get
encode_move
protect_alter
move_subdir
unclude_del
name_move
unclude
file
name
file_type
unclude_move
file_code
parent
protect_get
global_ref_get
alter_mspec
alter_spec
include_cb
include_pc
include_syntax
fragment_index
fragment_name
fragment_name_oor
entry_type
alter_polynom_coeff
get_polynom_noin
get_polynom
put_polynom_noin
madd_polynom
parse_polynom_scalar
alter_polynom_ord
parse_polynom
spf_polynom
entry_polynom_scalar
put_polynom1
put_polynom2
parse_polynom_ncols1
parse_polynom_ncols2
alter_polynom_input
add_polynom
entry_polynom
parse_lincom_non_ncols
parse_lincom_non
get_lincom_non
xz_get
xz_nframes
lzma_get
lzma_nframes
add_sbit
parse_sbit
put_sbit
get_sbit
madd_sbit
flush_spec
index_domain
madd_clincom
index
madd_const
index_range
add_clincom
add_cpolynom
get_clincom
convert_float32_complex64
convert_int32_complex128
get_endian_complex128_big
get_endian_complex128_arm
get_endian_complex128_little
convert_complex64_float64
parse_meta_index2
convert_uint16_complex128
put_endian_complex64_arm
put_endian_complex64_big
put_endian_complex64_little
convert_uint16_complex64
convert_float64_complex128
repr_int8
convert_complex64_int64
convert_uint64_complex64
convert_complex64_complex128
get_const
convert_uint8_complex128
parse_meta_implicit2
convert_float32_complex128
get_complex64
add_spec_meta
convert_float64_complex64
convert_int16_complex128
alter_cpolynom
madd_cpolynom
convert_int32_complex64
alter_lincom_23
convert_complex64_uint64
repr_uint8
put_complex128
get_endian_complex64_big
get_endian_complex64_arm
get_endian_complex64_little
alter_spec_meta
repr_real_a
repr_real_i
repr_real_m
repr_real_r
repr_int16
convert_uint8_complex64
repr_int32
madd_string
convert_complex128_float64
repr_uint16
repr_int64
put_endian_complex128_arm
put_endian_complex128_big
put_endian_complex128_little
get_complex128
repr_uint32
convert_complex128_uint64
get_const_repr
convert_complex128_int64
repr_float32
repr_uint64
convert_int16_complex64
repr_float64
put_complex64
convert_uint64_complex128
convert_int64_complex64
repr_a
repr_i
repr_m
repr_r
get_const_complex
convert_int8_complex128
convert_uint32_complex128
parse_meta_implicit
get_cpolynom
put_repr
convert_complex128_complex64
convert_int8_complex64
convert_uint32_complex64
convert_int64_complex128
move_meta
add_scalar
alter_entry_scalar2a
alter_entry_scalar2n
alter_entry_scalar3
alter_entry_scalar4
get_zero
entry_scalar_repr
header_complex
version_5_strict
parse_version_permissive
version_7_strict
version_0
version_1
version_2
version_3
version_4
version_5
version_6
version_7
version_6_strict
eof
eof_index
eof_lincom
eof_phase
bof
bof_lincom
bof_phase
put_linterp_nomono
get_linterp_sort
put_linterp_reverse
alter_lincom_32
parse_recip
parse_divide
alter_recip
dfes_recip
add_crecip89
add_divide
put_divide
madd_recip
add_crecip
get_recip_const
spf_divide
add_divide_invalid
version_8
alter_crecip89
put_recip
spf_recip
madd_crecip89
alter_divide
get_recip
alter_crecip
madd_divide
dfes_divide
madd_crecip
add_recip
get_divide
version_8_strict
version_5_write
version_0_write
version_7_write
version_2_write
version_4_write
version_6_write
version_1_write
version_8_write
version_3_write
put_carray_slice
cvlist_array_meta
del_carray
get_carray_slice
cvlist_array
del_carray_deref
nmeta_vectors_del
get_carray
parse_carray
madd_carray
add_carray
put_carray
get_carray_len
parse_carray_long
alter_carray_len
alter_carray_type
ascii_get_get
+ Makefile
Makefile.in
*.o
*.odirfile
*.swp
*.exe
.deps
.libs
convert_uint8_int8
convert_uint8_uint16
convert_uint8_int16
convert_uint8_uint32
convert_uint8_int32
convert_uint8_float32
convert_uint8_uint64
convert_uint8_int64
convert_uint8_float64
convert_int8_uint8
convert_int8_uint16
convert_int8_int16
convert_int8_uint32
convert_int8_int32
convert_int8_float32
convert_int8_uint64
convert_int8_int64
convert_int8_float64
convert_uint16_uint8
convert_uint16_int8
convert_uint16_int16
convert_uint16_uint32
convert_uint16_int32
convert_uint16_float32
convert_uint16_uint64
convert_uint16_int64
convert_uint16_float64
convert_int16_uint8
convert_int16_int8
convert_int16_uint16
convert_int16_uint32
convert_int16_int32
convert_int16_float32
convert_int16_uint64
convert_int16_int64
convert_int16_float64
convert_uint32_uint8
convert_uint32_int8
convert_uint32_uint16
convert_uint32_int16
convert_uint32_int32
convert_uint32_float32
convert_uint32_uint64
convert_uint32_int64
convert_uint32_float64
convert_int32_uint8
convert_int32_int8
convert_int32_uint16
convert_int32_int16
convert_int32_uint32
convert_int32_float32
convert_int32_uint64
convert_int32_int64
convert_int32_float64
convert_uint64_uint8
convert_uint64_int8
convert_uint64_uint16
convert_uint64_int16
convert_uint64_uint32
convert_uint64_int32
convert_uint64_float32
convert_uint64_int64
convert_uint64_float64
convert_int64_uint8
convert_int64_int8
convert_int64_uint16
convert_int64_int16
convert_int64_uint32
convert_int64_int32
convert_int64_float32
convert_int64_uint64
convert_int64_float64
convert_float32_uint8
convert_float32_int8
convert_float32_uint16
convert_float32_int16
convert_float32_uint32
convert_float32_int32
convert_float32_uint64
convert_float32_int64
convert_float32_float64
convert_float64_uint8
convert_float64_int8
convert_float64_uint16
convert_float64_int16
convert_float64_uint32
convert_float64_int32
convert_float64_float32
convert_float64_uint64
convert_float64_int64
creat
creat_excl
creat_rdonly
flist
flist_invalid
get64
get_bad_code
get_bit
get_char
get_endian8
get_endian16
get_endian32
get_endian64
get_endian_float32_big
get_endian_float32_arm
get_endian_float32_little
get_endian_float64_big
get_endian_float64_arm
get_endian_float64_little
get_ff
get_float32
get_float64
get_foffs
get_fs
get_int8
get_int16
get_int32
get_int64
get_invalid
get_lincom1
get_lincom2
get_lincom3
get_lincom_noin
get_linterp
get_linterp_noin
get_linterp_notab
get_multiply
get_multiply_noin
get_nonexistent
get_null
get_off64
get_phase
get_recurse
get_sf
get_ss
get_type
get_uint16
get_uint32
get_uint64
legacy_get
legacy_nframes
legacy_nonexistent
legacy_put
legacy_spf
nfields
nfields_invalid
nframes
nframes64
nframes_empty
nframes_invalid
nframes_off64
nframes_spf
open
open_eaccess
open_nonexistent
open_notdirfile
parse_badline
parse_bit
parse_bit4
parse_bit_bitnum
parse_bit_bitsize
parse_bit_ncols
parse_bit_numbits
parse_endian_bad
parse_endian_big
parse_endian_force
parse_endian_little
parse_foffs
parse_include
parse_include_nonexistent
parse_index
parse_lincom
parse_lincom_ncols1
parse_lincom_ncols2
parse_lincom_nfields
parse_lincom_nofields
parse_linterp
parse_linterp_ncols
parse_multiply
parse_multiply_ncols
parse_ncols
parse_phase
parse_phase_ncols
parse_raw
parse_raw_char
parse_raw_ncols
parse_raw_spf
parse_raw_type
parse_version
parse_version_include
put64
put_bad_code
put_bit
put_bof
put_char
put_endian8
put_endian16
put_endian32
put_endian64
put_endian_float32_arm
put_endian_float32_big
put_endian_float32_little
put_endian_float64_arm
put_endian_float64_big
put_endian_float64_little
put_ff
put_float32
put_float64
put_foffs
put_fs
put_int8
put_int16
put_int32
put_int64
put_invalid
put_lincom1
put_lincom2
put_lincom_noin
put_linterp
put_linterp_notab
put_multiply
put_null
put_off64
put_phase
put_phase_noin
put_rdonly
put_recurse
put_rofs
put_sf
put_ss
put_type
put_uint16
put_uint32
put_uint64
spf
spf_lincom
spf_multiply
spf_recurse
trunc
trunc_rdonly
trunc_rofs
flush_invalid
parse_version_slash
flush_all
flush
close_null
close
parse_endian_slash
error_error
parse_name
parse_include_slash
close_bad
parse_foffs_slash
flush_bad_code
dfes_bit
dfes_lincom
dfes_linterp
dfes_multiply
dfes_null
dfes_phase
dfes_raw
dfes_zero
entry_bad_code
entry_bit
entry_invalid
entry_lincom
entry_linterp
entry_multiply
entry_phase
entry_raw
legacy_get_put
legacy_get_rofs
add_phase
add_lincom_nfields
add_raw
add_multiply
add_bit_bitsize
flush_meta
add_type
add_raw_type
add_bit_bitnum
add_bit
add_format
add_raw_spf
put_linterp_noin
error_short
error
add
add_linterp
nfragments
add_duplicate
add_code
add_bit_numbits
add_lincom
add_rdonly
ascii_get
ascii_put
ascii_nframes
slim_get
slim_nframes
slim_put
add_many
add_sort
nfields_type
nfields_type_invalid
nmeta
nmeta_invalid
nmeta_parent
nmeta_type
nmeta_type_invalid
nmeta_type_parent
nmeta_vectors
nmeta_vectors_invalid
nmeta_vectors_parent
nvectors
nvectors_invalid
parse_const
parse_const_ncols
parse_duplicate
parse_meta
parse_meta_parent
parse_meta_raw
parse_quote
parse_sort
parse_string
parse_string_ncols
parse_whitespace
madd_linterp_invalid
madd_lincom_invalid
vlist_invalid
vlist_meta
add_raw_invalid
cvlist_invalid
svlist_invalid
cvlist
svlist
madd_phase_invalid
add_invalid
madd_phase
add_phase_invalid
add_spec_directive
add_string
add_linterp_invalid
madd_multiply
flist_type_invalid
clist
cvlist_meta_invalid
flist_meta_invalid
flist_type
svlist_meta_invalid
cvlist_meta
vlist_meta_invalid
svlist_meta
parse_string_null
madd_linterp
madd_lincom
vlist
add_bit_invalid
add_lincom_invalid
madd_bit_invalid
madd_bit
add_multiply_invalid
add_const
madd_multiply_invalid
madd
add_spec_invalid
flist_type_meta_invalid
add_spec
flist_type_meta
flist_meta
parse_meta_index
entry_raw_scalar_code
parse_bit_scalar
entry_raw_scalar_type
entry_lincom_scalar
entry_phase_scalar
entry_raw_scalar
parse_lincom_scalar
entry_bit_scalar
parse_raw_scalar
parse_phase_scalar
include
include_nonexistent
include_creat
include_invalid
include_accmode
include_index
madd_spec_directive
madd_spec_invalid
madd_spec
parse_quote_mismatch
parse_eol
parse_foffs_include
put_string
parse_protect_data
put_const
put_string_protect
ref
put_const_protect
parse_protect_all
ref_none
parse_ref
add_protect
parse_protect_format
parse_protect_bad
ref_two
put_protect
include_rdonly
parse_ref_nonexistent
parse_protect_none
parse_name_pedantic
parse_name_dot
parse_name_ext
parse_duplicate_ignore
gzip_get
gzip_nframes
gzip_put
gzip_get_get
bzip_get
bzip_nframes
bzip_put
bzip_get_get
global_name
open_cb_abort
open_cb_cont
open_cb_ignore
open_cb_rescan
open_cb_invalid
del_const_force
del_const
del_derived_force
del_const_deref
del_meta_force
del_data
del_meta
del
del_derived
close_discard
global_ref_set
global_ref_empty
include_ignore
global_ref
include_ref
include_auto
move
move_index
move_protect
move_data_enc_ar
bzip_move_from
gzip_move_from
move_data_foffs
move_data_enc_ra
move_data_endian
move_data_nop
alter_multiply
alter_bit_bitnum
alter_entry_recode
alter_linterp_move
alter_raw_spf
alter_entry
alter_bit_numbits
alter_lincom_slope
alter_raw_type
alter_lincom_input
alter_const
alter_phase
alter_lincom_offset
alter_linterp
foffs_get
foffs_move
foffs_alter
endian_alter
endian_move
endian_get
encode_alter
encode_get
encode_move
protect_alter
move_subdir
unclude_del
name_move
unclude
file
name
file_type
unclude_move
file_code
parent
protect_get
global_ref_get
alter_mspec
alter_spec
include_cb
include_pc
include_syntax
fragment_index
fragment_name
fragment_name_oor
entry_type
alter_polynom_coeff
get_polynom_noin
get_polynom
put_polynom_noin
madd_polynom
parse_polynom_scalar
alter_polynom_ord
parse_polynom
spf_polynom
entry_polynom_scalar
put_polynom1
put_polynom2
parse_polynom_ncols1
parse_polynom_ncols2
alter_polynom_input
add_polynom
entry_polynom
parse_lincom_non_ncols
parse_lincom_non
get_lincom_non
xz_get
xz_nframes
lzma_get
lzma_nframes
add_sbit
parse_sbit
put_sbit
get_sbit
madd_sbit
flush_spec
index_domain
madd_clincom
index
madd_const
index_range
add_clincom
add_cpolynom
get_clincom
convert_float32_complex64
convert_int32_complex128
get_endian_complex128_big
get_endian_complex128_arm
get_endian_complex128_little
convert_complex64_float64
parse_meta_index2
convert_uint16_complex128
put_endian_complex64_arm
put_endian_complex64_big
put_endian_complex64_little
convert_uint16_complex64
convert_float64_complex128
repr_int8
convert_complex64_int64
convert_uint64_complex64
convert_complex64_complex128
get_const
convert_uint8_complex128
parse_meta_implicit2
convert_float32_complex128
get_complex64
add_spec_meta
convert_float64_complex64
convert_int16_complex128
alter_cpolynom
madd_cpolynom
convert_int32_complex64
alter_lincom_23
convert_complex64_uint64
repr_uint8
put_complex128
get_endian_complex64_big
get_endian_complex64_arm
get_endian_complex64_little
alter_spec_meta
repr_real_a
repr_real_i
repr_real_m
repr_real_r
repr_int16
convert_uint8_complex64
repr_int32
madd_string
convert_complex128_float64
repr_uint16
repr_int64
put_endian_complex128_arm
put_endian_complex128_big
put_endian_complex128_little
get_complex128
repr_uint32
convert_complex128_uint64
get_const_repr
convert_complex128_int64
repr_float32
repr_uint64
convert_int16_complex64
repr_float64
put_complex64
convert_uint64_complex128
convert_int64_complex64
repr_a
repr_i
repr_m
repr_r
get_const_complex
convert_int8_complex128
convert_uint32_complex128
parse_meta_implicit
get_cpolynom
put_repr
convert_complex128_complex64
convert_int8_complex64
convert_uint32_complex64
convert_int64_complex128
move_meta
add_scalar
alter_entry_scalar2a
alter_entry_scalar2n
alter_entry_scalar3
alter_entry_scalar4
get_zero
entry_scalar_repr
header_complex
version_5_strict
parse_version_permissive
version_7_strict
version_0
version_1
version_2
version_3
version_4
version_5
version_6
version_7
version_6_strict
eof
eof_index
eof_lincom
eof_phase
bof
bof_lincom
bof_phase
put_linterp_nomono
get_linterp_sort
put_linterp_reverse
alter_lincom_32
parse_recip
parse_divide
alter_recip
dfes_recip
add_crecip89
add_divide
put_divide
madd_recip
add_crecip
get_recip_const
spf_divide
add_divide_invalid
version_8
alter_crecip89
put_recip
spf_recip
madd_crecip89
alter_divide
get_recip
alter_crecip
madd_divide
dfes_divide
madd_crecip
add_recip
get_divide
version_8_strict
version_5_write
version_0_write
version_7_write
version_2_write
version_4_write
version_6_write
version_1_write
version_8_write
version_3_write
put_carray_slice
cvlist_array_meta
del_carray
get_carray_slice
cvlist_array
del_carray_deref
nmeta_vectors_del
get_carray
parse_carray
madd_carray
add_carray
put_carray
get_carray_len
parse_carray_long
alter_carray_len
alter_carray_type
ascii_get_get
parse_include_relabs
parse_include_absrel
parse_include_relrel
parse_include_absolute
Modified: branches/getdata-0.7/test/Makefile.am
===================================================================
--- branches/getdata-0.7/test/Makefile.am 2011-03-14 21:55:32 UTC (rev 512)
+++ branches/getdata-0.7/test/Makefile.am 2011-03-15 03:03:52 UTC (rev 513)
@@ -232,13 +232,14 @@
parse_duplicate_ignore parse_endian_bad parse_endian_big \
parse_endian_force parse_endian_little parse_endian_slash \
parse_eol parse_foffs parse_foffs_include parse_foffs_slash \
- parse_include parse_include_nonexistent parse_include_slash \
- parse_index parse_lincom parse_lincom_ncols1 parse_lincom_ncols2 \
- parse_lincom_nfields parse_lincom_nofields parse_lincom_non \
- parse_lincom_non_ncols parse_lincom_scalar parse_linterp \
- parse_linterp_ncols parse_meta parse_meta_implicit \
- parse_meta_implicit2 parse_meta_index parse_meta_index2 \
- parse_meta_parent parse_meta_raw parse_multiply \
+ parse_include parse_include_absolute parse_include_absrel \
+ parse_include_nonexistent parse_include_relabs \
+ parse_include_relrel parse_include_slash parse_index parse_lincom \
+ parse_lincom_ncols1 parse_lincom_ncols2 parse_lincom_nfields \
+ parse_lincom_nofields parse_lincom_non parse_lincom_non_ncols \
+ parse_lincom_scalar parse_linterp parse_linterp_ncols parse_meta \
+ parse_meta_implicit parse_meta_implicit2 parse_meta_index \
+ parse_meta_index2 parse_meta_parent parse_meta_raw parse_multiply \
parse_multiply_ncols parse_name parse_name_dot parse_name_ext \
parse_name_pedantic parse_ncols parse_phase parse_phase_ncols \
parse_phase_scalar parse_polynom parse_polynom_ncols1 \
Modified: branches/getdata-0.7/test/move_data_endian.c
===================================================================
--- branches/getdata-0.7/test/move_data_endian.c 2011-03-14 21:55:32 UTC (rev 512)
+++ branches/getdata-0.7/test/move_data_endian.c 2011-03-15 03:03:52 UTC (rev 513)
@@ -54,11 +54,16 @@
fd = open(data, O_RDONLY | O_BINARY);
i = 0;
- while (read(fd, &d, sizeof(uint16_t))) {
- CHECKXi(i, d, i * 0x102);
- i++;
+ if (fd == -1) {
+ perror("open: ");
+ r = 1;
+ } else {
+ while (read(fd, &d, sizeof(uint16_t))) {
+ CHECKXi(i, d, i * 0x102);
+ i++;
+ }
+ close(fd);
}
- close(fd);
unlink(format1);
unlink(format);
Added: branches/getdata-0.7/test/parse_include_absolute.c
===================================================================
--- branches/getdata-0.7/test/parse_include_absolute.c (rev 0)
+++ branches/getdata-0.7/test/parse_include_absolute.c 2011-03-15 03:03:52 UTC (rev 513)
@@ -0,0 +1,56 @@
+/* Test include */
+#include "test.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <string.h>
+#include <errno.h>
+
+int main(void)
+{
+ const char *filedir = __TEST__ "dirfile";
+ const char *format = __TEST__ "dirfile/format";
+ const char *format1 = __TEST__ "dirfile/format1";
+ const char *format_data1 = "INCLUDE ";
+ const char *format_data2 = "/" __TEST__ "dirfile/format1\n";
+ const char *format1_data = "data RAW UINT8 11\n";
+ int cwd_size = 2048;
+ char *ptr, *cwd = NULL;
+ int fd, r = 0;
+ DIRFILE *D;
+ gd_spf_t spf;
+
+ mkdir(filedir, 0777);
+
+ do {
+ ptr = (char*)realloc(cwd, cwd_size *= 2);
+ if (ptr == NULL) {
+ fprintf(stderr, "out of memory for cwd!\n");
+ exit(1);
+ }
+ } while (!getcwd(cwd = ptr, cwd_size));
+
+ fd = open(format, O_CREAT | O_EXCL | O_WRONLY, 0666);
+ write(fd, format_data1, strlen(format_data1));
+ write(fd, cwd, strlen(cwd));
+ write(fd, format_data2, strlen(format_data2));
+ close(fd);
+
+ fd = open(format1, O_CREAT | O_EXCL | O_WRONLY, 0666);
+ write(fd, format1_data, strlen(format1_data));
+ close(fd);
+
+ D = gd_open(filedir, GD_RDONLY | GD_VERBOSE);
+ spf = gd_spf(D, "data");
+ gd_close(D);
+
+ unlink(format1);
+ unlink(format);
+ rmdir(filedir);
+
+ CHECKU(spf, 11);
+ return r;
+}
Added: branches/getdata-0.7/test/parse_include_absrel.c
===================================================================
--- branches/getdata-0.7/test/parse_include_absrel.c (rev 0)
+++ branches/getdata-0.7/test/parse_include_absrel.c 2011-03-15 03:03:52 UTC (rev 513)
@@ -0,0 +1,63 @@
+/* Test include */
+#include "test.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <string.h>
+#include <errno.h>
+
+int main(void)
+{
+ const char *filedir = __TEST__ "dirfile";
+ const char *format = __TEST__ "dirfile/format";
+ const char *format1 = __TEST__ "dirfile/format1";
+ const char *format2 = __TEST__ "dirfile/format2";
+ const char *format_data1 = "INCLUDE ";
+ const char *format_data2 = "/" __TEST__ "dirfile/format1\n";
+ const char *format1_data = "INCLUDE format2\n";
+ const char *format2_data = "data RAW UINT8 11\n";
+ int cwd_size = 2048;
+ char *ptr, *cwd = NULL;
+ int fd, r = 0;
+ DIRFILE *D;
+ gd_spf_t spf;
+
+ mkdir(filedir, 0777);
+
+ do {
+ ptr = (char*)realloc(cwd, cwd_size *= 2);
+ if (ptr == NULL) {
+ fprintf(stderr, "out of memory for cwd!\n");
+ exit(1);
+ }
+ } while (!getcwd(cwd = ptr, cwd_size));
+
+ fd = open(format, O_CREAT | O_EXCL | O_WRONLY, 0666);
+ write(fd, format_data1, strlen(format_data1));
+ write(fd, cwd, strlen(cwd));
+ write(fd, format_data2, strlen(format_data2));
+ close(fd);
+
+ fd = open(format1, O_CREAT | O_EXCL | O_WRONLY, 0666);
+ write(fd, format1_data, strlen(format1_data));
+ close(fd);
+
+ fd = open(format2, O_CREAT | O_EXCL | O_WRONLY, 0666);
+ write(fd, format2_data, strlen(format2_data));
+ close(fd);
+
+ D = gd_open(filedir, GD_RDONLY | GD_VERBOSE);
+ spf = gd_spf(D, "data");
+ gd_close(D);
+
+ unlink(format2);
+ unlink(format1);
+ unlink(format);
+ rmdir(filedir);
+
+ CHECKU(spf, 11);
+ return r;
+}
Added: branches/getdata-0.7/test/parse_include_relabs.c
===================================================================
--- branches/getdata-0.7/test/parse_include_relabs.c (rev 0)
+++ branches/getdata-0.7/test/parse_include_relabs.c 2011-03-15 03:03:52 UTC (rev 513)
@@ -0,0 +1,66 @@
+/* Test include */
+#include "test.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <string.h>
+#include <errno.h>
+
+int main(void)
+{
+ const char *filedir = __TEST__ "dirfile";
+ const char *subdir = __TEST__ "dirfile/sub";
+ const char *format = __TEST__ "dirfile/format";
+ const char *format1 = __TEST__ "dirfile/sub/format1";
+ const char *format2 = __TEST__ "dirfile/sub/format2";
+ const char *format_data = "INCLUDE sub/format1\n";
+ const char *format1_data1 = "INCLUDE ";
+ const char *format1_data2 = "/" __TEST__ "dirfile/sub/format2\n";
+ const char *format2_data = "data RAW UINT8 11\n";
+ int cwd_size = 2048;
+ char *ptr, *cwd = NULL;
+ int fd, r = 0;
+ DIRFILE *D;
+ gd_spf_t spf;
+
+ mkdir(filedir, 0777);
+ mkdir(subdir, 0777);
+
+ do {
+ ptr = (char*)realloc(cwd, cwd_size *= 2);
+ if (ptr == NULL) {
+ fprintf(stderr, "out of memory for cwd!\n");
+ exit(1);
+ }
+ } while (!getcwd(cwd = ptr, cwd_size));
+
+ fd = open(format, O_CREAT | O_EXCL | O_WRONLY, 0666);
+ write(fd, format_data, strlen(format_data));
+ close(fd);
+
+ fd = open(format1, O_CREAT | O_EXCL | O_WRONLY, 0666);
+ write(fd, format1_data1, strlen(format1_data1));
+ write(fd, cwd, strlen(cwd));
+ write(fd, format1_data2, strlen(format1_data2));
+ close(fd);
+
+ fd = open(format2, O_CREAT | O_EXCL | O_WRONLY, 0666);
+ write(fd, format2_data, strlen(format2_data));
+ close(fd);
+
+ D = gd_open(filedir, GD_RDONLY | GD_VERBOSE);
+ spf = gd_spf(D, "data");
+ gd_close(D);
+
+ unlink(format2);
+ unlink(format1);
+ unlink(format);
+ rmdir(subdir);
+ rmdir(filedir);
+
+ CHECKU(spf, 11);
+ return r;
+}
Added: branches/getdata-0.7/test/parse_include_relrel.c
===================================================================
--- branches/getdata-0.7/test/parse_include_relrel.c (rev 0)
+++ branches/getdata-0.7/test/parse_include_relrel.c 2011-03-15 03:03:52 UTC (rev 513)
@@ -0,0 +1,53 @@
+/* Test include */
+#include "test.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <string.h>
+#include <errno.h>
+
+int main(void)
+{
+ const char *filedir = __TEST__ "dirfile";
+ const char *subdir = __TEST__ "dirfile/sub";
+ const char *format = __TEST__ "dirfile/format";
+ const char *format1 = __TEST__ "dirfile/sub/format1";
+ const char *format2 = __TEST__ "dirfile/sub/format2";
+ const char *format_data = "INCLUDE sub/format1\n";
+ const char *format1_data = "INCLUDE format2\n";
+ const char *format2_data = "data RAW UINT8 11\n";
+ int fd, r = 0;
+ DIRFILE *D;
+ gd_spf_t spf;
+
+ mkdir(filedir, 0777);
+ mkdir(subdir, 0777);
+
+ fd = open(format, O_CREAT | O_EXCL | O_WRONLY, 0666);
+ write(fd, format_data, strlen(format_data));
+ close(fd);
+
+ fd = open(format1, O_CREAT | O_EXCL | O_WRONLY, 0666);
+ write(fd, format1_data, strlen(format1_data));
+ close(fd);
+
+ fd = open(format2, O_CREAT | O_EXCL | O_WRONLY, 0666);
+ write(fd, format2_data, strlen(format2_data));
+ close(fd);
+
+ D = gd_open(filedir, GD_RDONLY | GD_VERBOSE);
+ spf = gd_spf(D, "data");
+ gd_close(D);
+
+ unlink(format2);
+ unlink(format1);
+ unlink(format);
+ rmdir(subdir);
+ rmdir(filedir);
+
+ CHECKU(spf, 11);
+ return r;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ket...@us...> - 2011-03-14 21:55:38
|
Revision: 512
http://getdata.svn.sourceforge.net/getdata/?rev=512&view=rev
Author: ketiltrout
Date: 2011-03-14 21:55:32 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
Branch 0.7
Added Paths:
-----------
branches/getdata-0.7/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ket...@us...> - 2011-03-12 12:07:40
|
Revision: 511
http://getdata.svn.sourceforge.net/getdata/?rev=511&view=rev
Author: ketiltrout
Date: 2011-03-12 12:07:34 +0000 (Sat, 12 Mar 2011)
Log Message:
-----------
Tidy.
Modified Paths:
--------------
trunk/getdata/src/getdata.h.in
Modified: trunk/getdata/src/getdata.h.in
===================================================================
--- trunk/getdata/src/getdata.h.in 2011-03-12 03:46:23 UTC (rev 510)
+++ trunk/getdata/src/getdata.h.in 2011-03-12 12:07:34 UTC (rev 511)
@@ -422,12 +422,12 @@
const GD_DCOMPLEXP(cb), int fragment_index) gd_nothrow
gd_nonnull ((1,2,4,5,6));
-extern int gd_add_carray(DIRFILE* D, const char* field_code,
+extern int gd_add_carray(DIRFILE *dirfile, const char *field_code,
gd_type_t const_type, size_t array_len, gd_type_t data_type,
- const void* values, int fragment_index) gd_nothrow gd_nonnull((1,2,6));
+ const void *values, int fragment_index) gd_nothrow gd_nonnull((1,2,6));
extern int gd_add_const(DIRFILE *dirfile, const char *field_code,
- gd_type_t const_type, gd_type_t data_type, const void* value,
+ gd_type_t const_type, gd_type_t data_type, const void *value,
int fragment_index) gd_nothrow gd_nonnull ((1,2,5));
extern int gd_add_cpolynom(DIRFILE *dirfile, const char *field_code,
@@ -486,7 +486,7 @@
const char *in_field, gd_bit_t bitnum, gd_bit_t numbits) gd_nothrow
gd_nonnull((1,2));
-extern int gd_alter_carray(DIRFILE* D, const char* field_code,
+extern int gd_alter_carray(DIRFILE *dirfile, const char *field_code,
gd_type_t const_type, size_t array_len) gd_nothrow gd_nonnull((1,2));
extern int gd_alter_clincom(DIRFILE *dirfile, const char *field_code,
@@ -536,20 +536,20 @@
const char *in_field, gd_bit_t bitnum, gd_bit_t numbits) gd_nothrow
gd_nonnull((1,2));
-extern size_t gd_carray_len(DIRFILE *D, const char *field_code_in) gd_nothrow
+extern size_t gd_carray_len(DIRFILE *dirfile, const char *field_code) gd_nothrow
gd_nonnull((1,2));
-extern int gd_get_carray(DIRFILE *D, const char *field_code_in,
+extern int gd_get_carray(DIRFILE *dirfile, const char *field_code,
gd_type_t return_type, void *data_out) gd_nothrow gd_nonnull((1,2));
-extern int gd_get_carray_slice(DIRFILE* D, const char *field_code_in,
+extern int gd_get_carray_slice(DIRFILE *dirfile, const char *field_code,
unsigned int start, size_t n, gd_type_t return_type, void *data_out)
gd_nothrow gd_nonnull((1,2));
-extern int gd_put_carray(DIRFILE* D, const char *field_code_in,
+extern int gd_put_carray(DIRFILE *dirfile, const char *field_code,
gd_type_t data_type, const void *data_in) gd_nothrow gd_nonnull((1,2,4));
-extern int gd_put_carray_slice(DIRFILE* D, const char *field_code_in,
+extern int gd_put_carray_slice(DIRFILE *dirfile, const char *field_code,
unsigned int first, size_t n, gd_type_t data_type, const void *data_in)
gd_nothrow gd_nonnull((1,2,6));
@@ -562,8 +562,8 @@
extern const void *gd_constants(DIRFILE *dirfile,
gd_type_t return_type) gd_nothrow gd_nonnull ((1));
-const gd_carray_t *gd_carrays(DIRFILE* D, gd_type_t return_type) gd_nothrow
-gd_nonnull ((1));
+extern const gd_carray_t *gd_carrays(DIRFILE *dirfile,
+ gd_type_t return_type) gd_nothrow gd_nonnull ((1));
extern gd_entry_t *gd_free_entry_strings(gd_entry_t *entry) gd_nothrow;
@@ -595,7 +595,7 @@
extern const char *gd_fragmentname(DIRFILE *dirfile,
int index) gd_nothrow gd_nonnull ((1));
-DIRFILE* gd_invalid_dirfile(void) gd_nothrow;
+extern DIRFILE *gd_invalid_dirfile(void) gd_nothrow;
extern int gd_madd(DIRFILE *dirfile, const gd_entry_t *entry,
const char *parent) gd_nothrow gd_nonnull ((1,2,3));
@@ -604,9 +604,9 @@
const char *field_code, const char *in_field, gd_bit_t bitnum,
gd_bit_t numbits) gd_nothrow gd_nonnull ((1,2,3,4));
-int gd_madd_carray(DIRFILE* D, const char* parent, const char* field_code,
- gd_type_t const_type, size_t array_len, gd_type_t data_type,
- const void* values) gd_nothrow gd_nonnull((1,2,3,7));
+extern int gd_madd_carray(DIRFILE *dirfile, const char *parent,
+ const char *field_code, gd_type_t const_type, size_t array_len,
+ gd_type_t data_type, const void *values) gd_nothrow gd_nonnull((1,2,3,7));
extern int gd_madd_clincom(DIRFILE *dirfile, const char *parent,
const char *field_code, int n_fields, const char **in_fields,
@@ -672,13 +672,13 @@
const char *field_code, const char *value) gd_nothrow
gd_nonnull ((1,2,3,4));
-extern int gd_dirfile_standards(DIRFILE *D, int vers) gd_nothrow
+extern int gd_dirfile_standards(DIRFILE *dirfile, int vers) gd_nothrow
gd_nonnull ((1));
extern const void *gd_mconstants(DIRFILE *dirfile, const char *parent,
gd_type_t return_type) gd_nothrow gd_nonnull((1,2));
-const gd_carray_t *gd_mcarrays(DIRFILE* D, const char* parent,
+extern const gd_carray_t *gd_mcarrays(DIRFILE *dirfile, const char *parent,
gd_type_t return_type) gd_nothrow;
extern const char **gd_mfield_list(DIRFILE *dirfile,
@@ -696,7 +696,7 @@
extern const char *gd_dirfilename(DIRFILE *dirfile) gd_nothrow gd_nonnull ((1));
extern gd_type_t gd_native_type(DIRFILE *dirfile,
- const char *field_code_in) gd_nothrow gd_nonnull ((1,2));
+ const char *field_code) gd_nothrow gd_nonnull ((1,2));
extern unsigned int gd_nfields(DIRFILE *dirfile) gd_nothrow gd_nonnull ((1));
@@ -738,14 +738,14 @@
gd_nonnull ((1, 2));
extern size_t gd_get_string(DIRFILE *dirfile, const char *field_code,
- size_t len, char *data) gd_nothrow gd_nonnull ((1, 2, 4));
+ size_t len, char *data) gd_nothrow gd_nonnull ((1, 2));
extern size_t gd_put_string(DIRFILE *dirfile, const char *field_code,
const char *data) gd_nothrow gd_nonnull ((1, 2, 3));
extern const char **gd_strings(DIRFILE *dirfile) gd_nothrow gd_nonnull ((1));
-extern int gd_validate(DIRFILE *dirfile, const char *field_code_in) gd_nothrow
+extern int gd_validate(DIRFILE *dirfile, const char *field_code) gd_nothrow
gd_nonnull((1,2));
extern const char **gd_vector_list(DIRFILE *dirfile) gd_nothrow gd_nonnull((1));
@@ -780,7 +780,7 @@
int recode) gd_nonnull ((1,2));
extern DIRFILE *gd_cbopen(const char *dirfilename, unsigned long int flags,
- gd_parser_callback_t sehandler, void* extra) gd_nonnull ((1));
+ gd_parser_callback_t sehandler, void *extra) gd_nonnull ((1));
extern int gd_close(DIRFILE *dirfile);
@@ -794,7 +794,7 @@
extern int gd_include(DIRFILE *dirfile, const char *file, int fragment_index,
unsigned long int flags) gd_nonnull ((1,2));
-double gd_framenum(DIRFILE* D, const char* field_code_in,
+extern double gd_framenum(DIRFILE *dirfile, const char *field_code,
double value) gd_nonnull ((1,2));
extern int gd_malter_spec(DIRFILE *dirfile, const char *line,
@@ -830,7 +830,7 @@
size_t num_samples, gd_type_t data_type, const void *data)
gd_nonnull ((1, 2));
-extern double gd_framenum_subset(DIRFILE* D, const char* field_code,
+extern double gd_framenum_subset(DIRFILE *dirfile, const char *field_code,
double value, off_t field_start, off_t field_end) gd_nonnull ((1,2));
extern off_t gd_frameoffset(DIRFILE *dirfile, int fragment) gd_nothrow
@@ -838,14 +838,14 @@
extern off_t gd_nframes(DIRFILE *dirfile) gd_nonnull ((1));
-extern off_t gd_bof(DIRFILE *dirfile, const char* field_code) gd_nothrow
+extern off_t gd_bof(DIRFILE *dirfile, const char *field_code) gd_nothrow
gd_nonnull ((1,2));
-extern off_t gd_eof(DIRFILE *dirfile, const char* field_code)
+extern off_t gd_eof(DIRFILE *dirfile, const char *field_code)
gd_nonnull ((1,2));
#else
# ifdef __REDIRECT_NTH
-extern off_t __REDIRECT_NTH (gd_bof, (DIRFILE *dirfile, const char* field_code),
+extern off_t __REDIRECT_NTH (gd_bof, (DIRFILE *dirfile, const char *field_code),
gd_bof64) gd_nonnull ((1,2));
extern off_t __REDIRECT_NTH (gd_frameoffset, (DIRFILE *dirfile, int fragment),
@@ -871,11 +871,11 @@
extern off_t __REDIRECT (gd_nframes, (DIRFILE *dirfile),
gd_nframes64) gd_nonnull ((1));
-extern off_t __REDIRECT (gd_eof, (DIRFILE *dirfile, const char* field_code),
+extern off_t __REDIRECT (gd_eof, (DIRFILE *dirfile, const char *field_code),
gd_eof64) gd_nonnull ((1,2));
-extern double __REDIRECT (gd_framenum_subset, (DIRFILE* D,
- const char* field_code, double value, off_t field_start, off_t field_end),
+extern double __REDIRECT (gd_framenum_subset, (DIRFILE *dirfile,
+ const char *field_code, double value, off_t field_start, off_t field_end),
gd_framenum_subset64) gd_nonnull ((1,2));
# else
# define gd_alter_frameoffset gd_alter_frameoffset64
@@ -909,15 +909,15 @@
extern off64_t gd_frameoffset64(DIRFILE *dirfile, int fragment) gd_nonnull((1));
-extern double gd_framenum_subset64(DIRFILE* D, const char* field_code_in,
+extern double gd_framenum_subset64(DIRFILE *dirfile, const char *field_code,
double value, off64_t field_start, off64_t field_end) gd_nonnull ((1,2));
extern off64_t gd_nframes64(DIRFILE *dirfile) gd_nonnull ((1));
-extern off64_t gd_bof64(DIRFILE *dirfile, const char* field_code) gd_nothrow
+extern off64_t gd_bof64(DIRFILE *dirfile, const char *field_code) gd_nothrow
gd_nonnull ((1,2));
-extern off64_t gd_eof64(DIRFILE *dirfile, const char* field_code)
+extern off64_t gd_eof64(DIRFILE *dirfile, const char *field_code)
gd_nonnull ((1,2));
#if (defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS == 64) || \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
