Thread: [Getdata-commits] SF.net SVN: getdata:[713] trunk/getdata (Page 6)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 713
          http://getdata.svn.sourceforge.net/getdata/?rev=713&view=rev
Author:   ketiltrout
Date:     2012-05-26 00:25:05 +0000 (Sat, 26 May 2012)
Log Message:
-----------
Change hot the 64-bit off_t API is handled.  It's now always available, regardless of platform.  Fix C++ bindings to use it, instead of _FILE_OFFSET_BITS.

Modified Paths:
--------------
    trunk/getdata/ChangeLog
    trunk/getdata/bindings/cxx/dirfile.cpp
    trunk/getdata/bindings/cxx/fragment.cpp
    trunk/getdata/bindings/cxx/getdata/dirfile.h
    trunk/getdata/bindings/perl/Makefile.am
    trunk/getdata/configure.ac
    trunk/getdata/man/Makefile.am
    trunk/getdata/man/gd_framenum_subset64.3
    trunk/getdata/man/gd_frameoffset64.3
    trunk/getdata/man/gd_getdata64.3
    trunk/getdata/man/gd_nframes64.3
    trunk/getdata/man/gd_putdata64.3
    trunk/getdata/src/common.c
    trunk/getdata/src/constant.c
    trunk/getdata/src/encoding.c
    trunk/getdata/src/flush.c
    trunk/getdata/src/getdata.c
    trunk/getdata/src/getdata.h.in
    trunk/getdata/src/internal.h
    trunk/getdata/src/name.c
    trunk/getdata/src/putdata.c
    trunk/getdata/src/types.c
    trunk/getdata/test/Makefile.am

Added Paths:
-----------
    trunk/getdata/man/gd_bof64.3
    trunk/getdata/man/gd_eof64.3
    trunk/getdata/man/gd_seek64.3
    trunk/getdata/man/gd_tell64.3

Modified: trunk/getdata/ChangeLog
===================================================================

--- trunk/getdata/ChangeLog	2012-05-23 23:24:48 UTC (rev 712)
+++ trunk/getdata/ChangeLog	2012-05-26 00:25:05 UTC (rev 713)
@@ -1,3 +1,20 @@
+2012-05-25   D. V. Wiebe <ge...@ke...> svn:712
+	* bindings/cxx/fragment.cpp (Fragment::Fragment Fragment::SetEndianness)
+	bindings/cxx/dirfile.cpp (Dirfile::NFrames Dirfile::EoF Dirfile::BoF
+	Dirfile::GetData Dirfile::PutData Dirfile::FrameNum Dirfile::Seek
+	Dirfile::Tell): Call the 64-bit API.
+
+	* src/getdata.h.in: Support GD_64BIT_API and use configure to define
+	gd_off64_t.
+	* src/internal.h bindings/cxx/getdata/dirfile.h: Define GD_64BIT_API before
+	including getdata.h.
+
+	* test/Makefile.am man/Makefile.am: Remove LFS_TRANSITIONAL_API (always
+	enabled).
+
+	* confihure.ac: Figure out a suitable type for gd_off64_t.  Remove
+	LFS_TRANSITIONAL_API conditional.
+
 2012-05-23   D. V. Wiebe <ge...@ke...> svn:710
 	* test/test.h: Don't redefine isnan if it's okay as-is.
 

Modified: trunk/getdata/bindings/cxx/dirfile.cpp
===================================================================
--- trunk/getdata/bindings/cxx/dirfile.cpp	2012-05-23 23:24:48 UTC (rev 712)
+++ trunk/getdata/bindings/cxx/dirfile.cpp	2012-05-26 00:25:05 UTC (rev 713)
@@ -259,17 +259,17 @@
 
 off_t Dirfile::NFrames() const
 {
-  return gd_nframes(D);
+  return (off_t)gd_nframes64(D);
 }
 
 off_t Dirfile::EoF(const char *field_code) const
 {
-  return gd_eof(D, field_code);
+  return (off_t)gd_eof64(D, field_code);
 }
 
 off_t Dirfile::BoF(const char *field_code) const
 {
-  return gd_bof(D, field_code);
+  return (off_t)gd_bof64(D, field_code);
 }
 
 int Dirfile::GetCarray(const char *field_code, DataType type, void *data_out,
@@ -292,8 +292,9 @@
     off_t first_sample, size_t num_frames, size_t num_samples,
     DataType type, void* data_out) const
 {
-  return gd_getdata(D, field_code, first_frame, first_sample, num_frames,
-      num_samples, (gd_type_t)type, data_out);
+  return gd_getdata64(D, field_code, (gd_off64_t)first_frame,
+      (gd_off64_t)first_sample, num_frames, num_samples, (gd_type_t)type,
+      data_out);
 }
 
 size_t Dirfile::GetString(const char *field_code, size_t len, char* data_out)
@@ -322,8 +323,9 @@
     off_t first_sample, size_t num_frames, size_t num_samples,
     DataType type, const void* data_in) const
 {
-  return gd_putdata(D, field_code, first_frame, first_sample, num_frames,
-      num_samples, (gd_type_t)type, data_in);
+  return gd_putdata64(D, field_code, (gd_off64_t)first_frame,
+      (gd_off64_t)first_sample, num_frames, num_samples, (gd_type_t)type,
+      data_in);
 }
 
 size_t Dirfile::PutString(const char *field_code, const char* data_in) const
@@ -424,7 +426,8 @@
 double Dirfile::FrameNum(const char* field_code, double value,
     off_t frame_start, off_t frame_end) const
 {
-  return gd_framenum_subset(D, field_code, value, frame_start, frame_end);
+  return gd_framenum_subset64(D, field_code, value, (gd_off64_t)frame_start,
+      (gd_off64_t)frame_end);
 }
 
 int Dirfile::FragmentIndex(const char* field_code) const
@@ -445,12 +448,13 @@
 off_t Dirfile::Seek(const char* field_code, off_t frame_num,
     off_t sample_num, int flags) const
 {
-  return gd_seek(D, field_code, frame_num, sample_num, flags);
+  return (off_t)gd_seek64(D, field_code, (gd_off64_t)frame_num,
+      (gd_off64_t)sample_num, flags);
 }
 
 off_t Dirfile::Tell(const char* field_code) const
 {
-  return gd_tell(D, field_code);
+  return (off_t)gd_tell64(D, field_code);
 }
 
 int Dirfile::AddAlias(const char* field_code, const char* target,

Modified: trunk/getdata/bindings/cxx/fragment.cpp
===================================================================
--- trunk/getdata/bindings/cxx/fragment.cpp	2012-05-23 23:24:48 UTC (rev 712)
+++ trunk/getdata/bindings/cxx/fragment.cpp	2012-05-26 00:25:05 UTC (rev 713)
@@ -31,7 +31,7 @@
   ind = index;
   enc = (GetData::EncodingScheme)gd_encoding(D->D, index);
   end = gd_endianness(D->D, index);
-  off = gd_frameoffset(D->D, index);
+  off = (off_t)gd_frameoffset64(D->D, index);
   prot = gd_protection(D->D, index);
   name = gd_fragmentname(D->D, index);
   parent = (index == 0) ? -1 : gd_parent_fragment(D->D, index);
@@ -73,7 +73,7 @@
 
 int Fragment::SetFrameOffset(off_t offset, int recode)
 {
-  int ret = gd_alter_frameoffset(D->D, offset, ind, recode);
+  int ret = gd_alter_frameoffset64(D->D, (gd_off64_t)offset, ind, recode);
 
   if (!ret)
     off = offset;

Modified: trunk/getdata/bindings/cxx/getdata/dirfile.h
===================================================================
--- trunk/getdata/bindings/cxx/getdata/dirfile.h	2012-05-23 23:24:48 UTC (rev 712)
+++ trunk/getdata/bindings/cxx/getdata/dirfile.h	2012-05-26 00:25:05 UTC (rev 713)
@@ -22,16 +22,17 @@
 #ifndef GETDATA_DIRFILE_H
 #define GETDATA_DIRFILE_H
 
-#ifndef _FILE_OFFSET_BITS
-# define _FILE_OFFSET_BITS 64
+// Enable the explicit 64-bit API (gd_getdata64() &c.)
+#ifndef GD_64BIT_API
+# define GD_64BIT_API
 #endif
 
-// We don't want the legacy API since its symbols clash with us.
+// Disable the legacy API since its symbols clash with us.
 #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
+// Use the C89 API since C++ compilers aren't required to support the
 // C99 _Complex keyword
 #ifndef GD_C89_API
 # define GD_C89_API

Modified: trunk/getdata/bindings/perl/Makefile.am
===================================================================
--- trunk/getdata/bindings/perl/Makefile.am	2012-05-23 23:24:48 UTC (rev 712)
+++ trunk/getdata/bindings/perl/Makefile.am	2012-05-26 00:25:05 UTC (rev 713)
@@ -37,22 +37,23 @@
 perlautogetdatadir=${perldir}/auto/GetData
 nodist_perlautogetdata_SCRIPTS=blib/arch/auto/GetData/GetData.bs blib/arch/auto/GetData/GetData.so
 
-t:
-	mkdir t
+t lib:
+	mkdir $@
 
-t/%.t: test/%.t t
+t/%.t: test/%.t
+	$(MAKE) t
 	cat $< > $@
 
-lib:
-	mkdir lib
-
-lib/GetData.xs: lib GetData.xs
+lib/GetData.xs: GetData.xs
+	$(MAKE) lib
 	cat $(srcdir)/GetData.xs > $@
 
-lib/typemap: lib typemap
+lib/typemap: typemap
+	$(MAKE) lib
 	cat $(srcdir)/typemap > $@
 
-lib/simple_funcs.xs: lib simple_funcs.xsin simple_funcs.pl
+lib/simple_funcs.xs: simple_funcs.xsin simple_funcs.pl
+	$(MAKE) lib
 	$(PERL) $(srcdir)/simple_funcs.pl $(srcdir)/simple_funcs.xsin > $@
 
 MANIFEST: MANIFEST.in
@@ -75,6 +76,7 @@
 	blib/lib/GetData.pm blib/libdoc/GetData.$(PERL_MAN3EXT): Build \
 	lib/GetData.xs lib/simple_funcs.xs lib/typemap
 	$(PERL) Build build
+	touch $@
 
 .PRECIOUS: Build
 Build: Build.PL GetData.pm lib/GetData.xs lib/simple_funcs.xs lib/typemap \

Modified: trunk/getdata/configure.ac
===================================================================
--- trunk/getdata/configure.ac	2012-05-23 23:24:48 UTC (rev 712)
+++ trunk/getdata/configure.ac	2012-05-26 00:25:05 UTC (rev 713)
@@ -620,17 +620,6 @@
 #endif
 ])
 
-if test "x$gd_cv_c_need_lfs_defined" = "xyes"; then
-  AC_DEFINE([_LARGEFILE64_SOURCE], [1],
-            [ Additional functionality from LFS for large files. ])
-fi
-
-if test "x$gd_cv_type_off64_t" = "xyes"; then
-  dnl Assume we have the entire LFS defined transitional API
-  AC_DEFINE([HAVE_OFF64_T], [1],
-            [ Define to 1 if the system has the type `off64_t'. ]) dnl `
-fi
-
 dnl integer sizes
 AC_CHECK_SIZEOF([short int])
 AC_CHECK_SIZEOF([int])
@@ -683,14 +672,31 @@
   gd_uint64_t="long long int"
 fi
 
+if test "x$gd_cv_type_off64_t" = "xyes"; then
+  dnl Assume we have the entire LFS defined transitional API
+  AC_DEFINE([HAVE_OFF64_T], [1],
+            [ Define to 1 if the system has the type `off64_t'. ]) dnl `
+  define_lf64s="#ifndef _LARGEFILE64_SOURCE
+#define _LARGEFILE64_SOURCE
+#endif
+"
+  gd_off64_t="off64_t"
+elif test $ac_cv_sizeof_off_t -eq 8;then
+  gd_off64_t="off64_t"
+else
+  gd_off64_t=$gd_int64_t
+fi
+
 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";
 DEFINE_gd_uint64_t="# define gd_uint64_t $gd_uint64_t";
+DEFINE_gd_off64_t="$define_lf64s# define gd_off64_t $gd_off64_t";
 AC_SUBST([DEFINE_gd_int16_t])
 AC_SUBST([DEFINE_gd_uint16_t])
 AC_SUBST([DEFINE_gd_int64_t])
 AC_SUBST([DEFINE_gd_uint64_t])
+AC_SUBST([DEFINE_gd_off64_t])
 
 dnl library functions
 echo
@@ -987,7 +993,6 @@
 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(INCLUDE_LEGACY_API, [test "x$include_legacy_api" != "xno"])
 AM_CONDITIONAL(MAKE_CXXBINDINGS, [test "x$make_cxxbindings" = "xyes"])
 AM_CONDITIONAL(MAKE_F77BINDINGS, [test "x$make_f77bindings" != "xno"])
@@ -1066,16 +1071,9 @@
   enable_debug="assert only"
 fi
 
-if test "x$gd_cv_type_off64_t" = "xyes"; then
-  lfs_transitional_api="yes"
-else
-  lfs_transitional_api="no"
-fi
-
 echo
 echo "Configuration summary: "
 echo "  ANSI C compatibility mode:     ${disable_c99}"
-echo "  LFS transitional API:          ${lfs_transitional_api}"
 echo "  Legacy API:                    ${include_legacy_api}"
 echo "  Verbose debugging:             ${enable_debug}"
 echo "  Use modules:                   ${use_modules}"

Modified: trunk/getdata/man/Makefile.am
===================================================================
--- trunk/getdata/man/Makefile.am	2012-05-23 23:24:48 UTC (rev 712)
+++ trunk/getdata/man/Makefile.am	2012-05-26 00:25:05 UTC (rev 713)
@@ -20,37 +20,33 @@
 #
 AUTOMAKE_OPTIONS = foreign
 
-if LFS_TRANSITIONAL_API
-LFS_transitional_mans = gd_getdata64.3 gd_framenum_subset64.3 \
-												gd_frameoffset64.3 gd_nframes64.3 gd_putdata64.3
-MAN3ALIASES64=gd_frameoffset64.3:gd_alter_frameoffset64.3
-endif
-
 nodist_man_MANS = gd_alter_encoding.3 gd_alter_endianness.3 \
 											 gd_alter_frameoffset.3
 dist_man_MANS = checkdirfile.1 dirfile2ascii.1 gd_add.3 gd_add_alias.3 \
 								gd_add_bit.3 gd_add_spec.3 gd_alias_target.3 gd_aliases.3 \
 								gd_alter_affixes.3 gd_alter_bit.3 gd_alter_entry.3 \
-								gd_alter_protection.3 gd_alter_spec.3 gd_bof.3 gd_carray_len.3 \
-								gd_carrays.3 gd_cbopen.3 gd_close.3 gd_constants.3 gd_delete.3 \
-								gd_desync.3 gd_dirfile_standards.3 gd_dirfilename.3 \
-								gd_encoding.3 gd_endianness.3 gd_entry.3 gd_entry_list.3 \
-								gd_entry_type.3 gd_eof.3 gd_error.3 gd_error_count.3 \
-								gd_error_string.3 gd_flags.3 gd_flush.3 gd_fragment_affixes.3 \
-								gd_fragment_index.3 gd_fragmentname.3 gd_framenum_subset.3 \
-								gd_frameoffset.3 gd_free_entry_strings.3 gd_get_carray_slice.3 \
-								gd_get_constant.3 gd_get_string.3 gd_getdata.3 gd_hidden.3 \
-								gd_hide.3 gd_include_affix.3 gd_invalid_dirfile.3 \
-								gd_madd_bit.3 gd_mcarrays.3 gd_mconstants.3 gd_metaflush.3 \
-								gd_move.3 gd_mplex_lookback.3 gd_mstrings.3 gd_naliases.3 \
+								gd_alter_protection.3 gd_alter_spec.3 gd_bof.3 gd_bof64.3 \
+								gd_carray_len.3 gd_carrays.3 gd_cbopen.3 gd_close.3 \
+								gd_constants.3 gd_delete.3 gd_desync.3 gd_dirfile_standards.3 \
+								gd_dirfilename.3 gd_encoding.3 gd_endianness.3 gd_entry.3 \
+								gd_entry_list.3 gd_entry_type.3 gd_eof.3 gd_eof64.3 gd_error.3 \
+								gd_error_count.3 gd_error_string.3 gd_flags.3 gd_flush.3 \
+								gd_fragment_affixes.3 gd_fragment_index.3 gd_fragmentname.3 \
+								gd_framenum_subset.3 gd_framenum_subset64.3 gd_frameoffset.3 \
+								gd_frameoffset64.3 gd_free_entry_strings.3 \
+								gd_get_carray_slice.3 gd_get_constant.3 gd_get_string.3 \
+								gd_getdata.3 gd_getdata64.3 gd_hidden.3 gd_hide.3 \
+								gd_include_affix.3 gd_invalid_dirfile.3 gd_madd_bit.3 \
+								gd_mcarrays.3 gd_mconstants.3 gd_metaflush.3 gd_move.3 \
+								gd_mplex_lookback.3 gd_mstrings.3 gd_naliases.3 \
 								gd_native_type.3 gd_nentries.3 gd_nfragments.3 gd_nframes.3 \
-								gd_parent_fragment.3 gd_parser_callback.3 gd_protection.3 \
-								gd_put_carray_slice.3 gd_put_constant.3 gd_put_string.3 \
-								gd_putdata.3 gd_raw_filename.3 gd_reference.3 gd_rename.3 \
-								gd_rewrite_fragment.3 gd_seek.3 gd_spf.3 gd_strings.3 \
-								gd_tell.3 gd_uninclude.3 gd_validate.3 gd_verbose_prefix.3 \
-								dirfile.5 dirfile-encoding.5 dirfile-format.5 \
-								$(LFS_transitional_mans)
+								gd_nframes64.3 gd_parent_fragment.3 gd_parser_callback.3 \
+								gd_protection.3 gd_put_carray_slice.3 gd_put_constant.3 \
+								gd_put_string.3 gd_putdata.3 gd_putdata64.3 gd_raw_filename.3 \
+								gd_reference.3 gd_rename.3 gd_rewrite_fragment.3 gd_seek.3 \
+								gd_seek64.3 gd_spf.3 gd_strings.3 gd_tell.3 gd_tell64.3 \
+								gd_uninclude.3 gd_validate.3 gd_verbose_prefix.3 dirfile.5 \
+								dirfile-encoding.5 dirfile-format.5
 
 # these are real_file:alias
 MAN3ALIASES=gd_add_bit.3:gd_add_carray.3 gd_add_bit.3:gd_add_clincom.3 \
@@ -99,7 +95,7 @@
 	gd_entry_list.3:gd_field_list.3 gd_entry_list.3:gd_field_list_by_type.3 \
 	gd_entry_list.3:gd_mfield_list.3 gd_entry_list.3:gd_mfield_list_by_type.3 \
 	gd_entry_list.3:gd_nmvectore.3 gd_entry_list.3:gd_vector_list.3 \
-	$(MAN3ALIASES64)
+	gd_frameoffset64.3:gd_alter_frameoffset64.3
 
 #man conversion
 HTMLMANS=$(addsuffix .html,$(nodist_man_MANS)) \

Added: trunk/getdata/man/gd_bof64.3
===================================================================
--- trunk/getdata/man/gd_bof64.3	                        (rev 0)
+++ trunk/getdata/man/gd_bof64.3	2012-05-26 00:25:05 UTC (rev 713)
@@ -0,0 +1,54 @@
+.\" gd_bof64.3.  The gd_bof64 man page.
+.\"
+.\" Copyright (C) 2012 D. V. Wiebe
+.\"
+.\""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+.\"
+.\" This file is part of the GetData project.
+.\"
+.\" Permission is granted to copy, distribute and/or modify this document
+.\" under the terms of the GNU Free Documentation License, Version 1.2 or
+.\" any later version published by the Free Software Foundation; with no
+.\" Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+.\" Texts.  A copy of the license is included in the `COPYING.DOC' file
+.\" as part of this distribution.
+.\"
+.TH gd_bof64 3 "25 May 2012" "Version 0.8.0" "GETDATA"
+.SH NAME
+gd_bof64 \(em retrieve data from a dirfile database, with largefile support
+.SH SYNOPSIS
+.B #define GD_64BIT_API
+
+.B #include <getdata.h>
+.HP
+.nh
+.ad l
+.BI "gd_off64_t gd_bof64(DIRFILE *" dirfile ", const char *" field_code );
+.hy
+.ad n
+.SH DESCRIPTION
+This version of
+.BR gd_bof (3)
+uses a 64-bit offset type
+.RB ( gd_off64_t ),
+where one is available, regardless of the size of
+.BR off_t .
+It is only available if one defines
+.IR GD_64BIT_API
+or
+.IR _LARGEFILE64_SOURCE
+before including getdata.h.
+
+If
+.I off_t
+is a 64-bit type (possibly because
+.I _FILE_OFFSET_BITS
+has been defined to 64), this function will the same as
+.BR gd_bof (3).
+Otherwise,
+.BR gd_bof (3)
+will be a version of this function which uses a 32-bit
+.IR off_t .
+.SH SEE ALSO
+.BR gd_bof (3),
+.BR feature_test_macros (7)

Added: trunk/getdata/man/gd_eof64.3
===================================================================
--- trunk/getdata/man/gd_eof64.3	                        (rev 0)
+++ trunk/getdata/man/gd_eof64.3	2012-05-26 00:25:05 UTC (rev 713)
@@ -0,0 +1,54 @@
+.\" gd_eof64.3.  The gd_eof64 man page.
+.\"
+.\" Copyright (C) 2012 D. V. Wiebe
+.\"
+.\""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+.\"
+.\" This file is part of the GetData project.
+.\"
+.\" Permission is granted to copy, distribute and/or modify this document
+.\" under the terms of the GNU Free Documentation License, Version 1.2 or
+.\" any later version published by the Free Software Foundation; with no
+.\" Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+.\" Texts.  A copy of the license is included in the `COPYING.DOC' file
+.\" as part of this distribution.
+.\"
+.TH gd_eof64 3 "25 May 2012" "Version 0.8.0" "GETDATA"
+.SH NAME
+gd_eof64 \(em retrieve data from a dirfile database, with largefile support
+.SH SYNOPSIS
+.B #define GD_64BIT_API
+
+.B #include <getdata.h>
+.HP
+.nh
+.ad l
+.BI "gd_off64_t gd_eof64(DIRFILE *" dirfile ", const char *" field_code );
+.hy
+.ad n
+.SH DESCRIPTION
+This version of
+.BR gd_eof (3)
+uses a 64-bit offset type
+.RB ( gd_off64_t ),
+where one is available, regardless of the size of
+.BR off_t .
+It is only available if one defines
+.IR GD_64BIT_API
+or
+.IR _LARGEFILE64_SOURCE
+before including getdata.h.
+
+If
+.I off_t
+is a 64-bit type (possibly because
+.I _FILE_OFFSET_BITS
+has been defined to 64), this function will the same as
+.BR gd_eof (3).
+Otherwise,
+.BR gd_eof (3)
+will be a version of this function which uses a 32-bit
+.IR off_t .
+.SH SEE ALSO
+.BR gd_eof (3),
+.BR feature_test_macros (7)

Modified: trunk/getdata/man/gd_framenum_subset64.3
===================================================================
--- trunk/getdata/man/gd_framenum_subset64.3	2012-05-23 23:24:48 UTC (rev 712)
+++ trunk/getdata/man/gd_framenum_subset64.3	2012-05-26 00:25:05 UTC (rev 713)
@@ -1,6 +1,6 @@
 .\" gd_framenum_subset64.3.  The gd_framenum_subset64 man page.
 .\"
-.\" Copyright (C) 2008, 2010 D. V. Wiebe
+.\" Copyright (C) 2008, 2010, 2012 D. V. Wiebe
 .\"
 .\""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 .\"
@@ -13,37 +13,43 @@
 .\" Texts.  A copy of the license is included in the `COPYING.DOC' file
 .\" as part of this distribution.
 .\"
-.TH gd_framenum_subset64 3 "15 July 2010" "Version 0.7.0" "GETDATA"
+.TH gd_framenum_subset64 3 "25 May 2012" "Version 0.8.0" "GETDATA"
 .SH NAME
 gd_framenum_subset64 \(em perform a reverse look-up on a monotonic dirfile
-field
+field, with largefile support.
 .SH SYNOPSIS
-.B #define _LARGEFILE64_SOURCE
+.B #define GD_64BIT_API
 
 .B #include <getdata.h>
 .HP
 .nh
 .ad l
 .BI "double gd_framenum_subset64(DIRFILE *" dirfile ,
-.BI "const char *" field_code ", double " value ", off64_t " field_start ,
-.BI "off64_t " field_end );
+.BI "const char *" field_code ", double " value ", gd_off64_t " field_start ,
+.BI "gd_off64_t " field_end );
 .hy
 .ad n
 .SH DESCRIPTION
 This version of
 .BR gd_framenum_subset (3)
-uses a 64-bit offset type, even if
-.I off_t
-is a 32-bit type.  It is only available if one defines
-.IR _LARGEFILE64_SOURCE .
+uses a 64-bit offset type
+.RB ( gd_off64_t ),
+where one is available, regardless of the size of
+.BR off_t .
+It is only available if one defines
+.IR GD_64BIT_API
+or
+.IR _LARGEFILE64_SOURCE
+before including getdata.h.
+
 If
 .I off_t
-is a 64-bit type (i.e. if
+is a 64-bit type (possibly because
 .I _FILE_OFFSET_BITS
-is defined to be 64), this function will be called
-.BR gd_framenum_subset ().
+has been defined to 64), this function will the same as
+.BR gd_framenum_subset (3).
 Otherwise,
-.BR gd_framenum_subset ()
+.BR gd_framenum_subset (3)
 will be a version of this function which uses a 32-bit
 .IR off_t .
 .SH SEE ALSO

Modified: trunk/getdata/man/gd_frameoffset64.3
===================================================================
--- trunk/getdata/man/gd_frameoffset64.3	2012-05-23 23:24:48 UTC (rev 712)
+++ trunk/getdata/man/gd_frameoffset64.3	2012-05-26 00:25:05 UTC (rev 713)
@@ -13,47 +13,51 @@
 .\" Texts.  A copy of the license is included in the `COPYING.DOC' file
 .\" as part of this distribution.
 .\"
-.TH gd_frameoffset64 3 "16 July 2010" "Version 0.7.0" "GETDATA"
+.TH gd_frameoffset64 3 "25 May 2012" "Version 0.8.0" "GETDATA"
 .SH NAME
 gd_frameoffset64, gd_alter_frameoffset64 \(em report or change the frame
 offset of fields in a dirfile, with largefile support
 .SH SYNOPSIS
-.B #define _LARGEFILE64_SOURCE
+.B #define GD_64BIT_API
 
 .B #include <getdata.h>
 .HP
 .nh
 .ad l
-.BI "off64_t gd_frameoffset(DIRFILE *" dirfile ", int " fragment_index );
+.BI "gd_off64_t gd_frameoffset(DIRFILE *" dirfile ", int " fragment_index );
 .HP
-.BI "int gd_alter_frameoffset64(DIRFILE *" dirfile ", off64_t " offset ,
+.BI "int gd_alter_frameoffset64(DIRFILE *" dirfile ", gd_off64_t " offset ,
 .BI "int " fragment_index ", int " move );
 .hy
 .ad n
 .SH DESCRIPTION
-These version of
+These versions of
 .BR gd_frameoffset (3)
 and
 .BR gd_alter_frameoffset (3)
-use a 64-bit offset type, even if
-.I off_t
-is a 32-bit type.  They are only available if the caller defines
-.I _LARGEFILE64_SOURCE 
+use a 64-bit offset type
+.RB ( gd_off64_t ),
+where one is available, regardless of the size of
+.BR off_t .
+They are only available if one defines
+.IR GD_64BIT_API
+or
+.IR _LARGEFILE64_SOURCE
 before including getdata.h.
 
 If
 .I off_t
-is a 64-bit type (i.e. if
+is a 64-bit type (possibly because
 .I _FILE_OFFSET_BITS
-is defined to be 64), these function will be called
-.BR gd_frameoffset ()
+has been defined to 64), these functions will the same as
+.BR gd_framenum_subset (3)
 and
-.BR gd_alter_frameoffset ().
+.BR gd_alter_frameoffset (3).
 Otherwise,
-.BR gd_frameoffset ()
+.BR gd_framenum_subset (3)
 and
-.BR gd_alter_frameoffset ()
-will be versions of these functions which use a 32-bit
+.BR gd_alter_frameoffset (3)
+will be versions of these function which use a 32-bit
 .IR off_t .
 .SH SEE ALSO
 .BR gd_alter_frameoffset (3),

Modified: trunk/getdata/man/gd_getdata64.3
===================================================================
--- trunk/getdata/man/gd_getdata64.3	2012-05-23 23:24:48 UTC (rev 712)
+++ trunk/getdata/man/gd_getdata64.3	2012-05-26 00:25:05 UTC (rev 713)
@@ -1,6 +1,6 @@
 .\" gd_getdata64.3.  The gd_getdata64 man page.
 .\"
-.\" Copyright (C) 2008, 2010 D. V. Wiebe
+.\" Copyright (C) 2008, 2010, 2012 D. V. Wiebe
 .\"
 .\""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 .\"
@@ -13,36 +13,43 @@
 .\" Texts.  A copy of the license is included in the `COPYING.DOC' file
 .\" as part of this distribution.
 .\"
-.TH gd_getdata64 3 "25 May 2010" "Version 0.7.0" "GETDATA"
+.TH gd_getdata64 3 "25 May 2012" "Version 0.8.0" "GETDATA"
 .SH NAME
-gd_getdata64 \(em retrieve data from a dirfile database with largefile support
+gd_getdata64 \(em retrieve data from a dirfile database, with largefile support
 .SH SYNOPSIS
-.B #define _LARGEFILE64_SOURCE
+.B #define GD_64BIT_API
 
 .B #include <getdata.h>
 .HP
 .nh
 .ad l
-.BI "size_t gd_getdata64(DIRFILE *" dirfile ", const char *" field_code ", off64_t"
-.IB first_frame ", off64_t " first_sample ", size_t " num_frames ", size_t"
-.IB num_samples ", gd_type_t " return_type ", void *" data_out );
+.BI "size_t gd_getdata64(DIRFILE *" dirfile ", const char *" field_code ,
+.BI "gd_off64_t " first_frame ", gd_off64_t " first_sample ", size_t
+.IB num_frames ", size_t " num_samples ", gd_type_t " return_type ,
+.BI "void *" data_out );
 .hy
 .ad n
 .SH DESCRIPTION
 This version of
 .BR gd_getdata (3)
-uses a 64-bit offset type, even if
-.I off_t
-is a 32-bit type.  It is only available if one defines
-.IR _LARGEFILE64_SOURCE .
+uses a 64-bit offset type
+.RB ( gd_off64_t ),
+where one is available, regardless of the size of
+.BR off_t .
+It is only available if one defines
+.IR GD_64BIT_API
+or
+.IR _LARGEFILE64_SOURCE
+before including getdata.h.
+
 If
 .I off_t
-is a 64-bit type (i.e. if
+is a 64-bit type (possibly because
 .I _FILE_OFFSET_BITS
-is defined to be 64), this function will be called
-.BR gd_getdata ().
+has been defined to 64), this function will the same as
+.BR gd_getdata (3).
 Otherwise,
-.BR gd_getdata ()
+.BR gd_getdata (3)
 will be a version of this function which uses a 32-bit
 .IR off_t .
 .SH SEE ALSO

Modified: trunk/getdata/man/gd_nframes64.3
===================================================================
--- trunk/getdata/man/gd_nframes64.3	2012-05-23 23:24:48 UTC (rev 712)
+++ trunk/getdata/man/gd_nframes64.3	2012-05-26 00:25:05 UTC (rev 713)
@@ -1,6 +1,6 @@
 .\" gd_nframes64.3.  The gd_nframes64 man page.
 .\"
-.\" Copyright (C) 2008, 2010 D. V. Wiebe
+.\" Copyright (C) 2008, 2010, 2012 D. V. Wiebe
 .\"
 .\""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 .\"
@@ -13,34 +13,40 @@
 .\" Texts.  A copy of the license is included in the `COPYING.DOC' file
 .\" as part of this distribution.
 .\"
-.TH gd_nframes64 3 "16 July 2010" "Version 0.7.0" "GETDATA"
+.TH gd_nframes64 3 "25 May 2012" "Version 0.8.0" "GETDATA"
 .SH NAME
-gd_nframes64 \(em report the size of a dirfile with largefile support
+gd_nframes64 \(em report the size of a dirfile, with largefile support
 .SH SYNOPSIS
-.B #define _LARGEFILE64_SOURCE
+.B #define GD_64BIT_API
 
 .B #include <getdata.h>
 .HP
 .nh
 .ad l
-.BI "off64_t gd_nframes64(DIRFILE *" dirfile );
+.BI "gd_off64_t gd_nframes64(DIRFILE *" dirfile );
 .hy
 .ad n
 .SH DESCRIPTION
 This version of
 .BR gd_nframes (3)
-uses a 64-bit offset type, even if
-.I off_t
-is a 32-bit type.  It is only available if one defines
-.IR _LARGEFILE64_SOURCE .
+uses a 64-bit offset type
+.RB ( gd_off64_t ),
+where one is available, regardless of the size of
+.BR off_t .
+It is only available if one defines
+.IR GD_64BIT_API
+or
+.IR _LARGEFILE64_SOURCE
+before including getdata.h.
+
 If
 .I off_t
-is a 64-bit type (i.e. if
+is a 64-bit type (possibly because
 .I _FILE_OFFSET_BITS
-is defined to be 64), this function will be called
-.BR gd_nframes ().
+has been defined to 64), this function will the same as
+.BR gd_nframes (3).
 Otherwise,
-.BR gd_nframes ()
+.BR gd_nframes (3)
 will be a version of this function which uses a 32-bit
 .IR off_t .
 .SH SEE ALSO

Modified: trunk/getdata/man/gd_putdata64.3
===================================================================
--- trunk/getdata/man/gd_putdata64.3	2012-05-23 23:24:48 UTC (rev 712)
+++ trunk/getdata/man/gd_putdata64.3	2012-05-26 00:25:05 UTC (rev 713)
@@ -1,6 +1,6 @@
 .\" gd_putdata64.3.  The gd_putdata64 man page.
 .\"
-.\" Copyright (C) 2008, 2010 D. V. Wiebe
+.\" Copyright (C) 2008, 2010, 2012 D. V. Wiebe
 .\"
 .\""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 .\"
@@ -13,36 +13,43 @@
 .\" Texts.  A copy of the license is included in the `COPYING.DOC' file
 .\" as part of this distribution.
 .\"
-.TH gd_putdata64 3 "25 May 2010" "Version 0.7.0" "GETDATA"
+.TH gd_putdata64 3 "25 May 2012" "Version 0.8.0" "GETDATA"
 .SH NAME
-gd_putdata64 \(em write data to a dirfile database with largefile support
+gd_putdata64 \(em write data to a dirfile database, with largefile support
 .SH SYNOPSIS
-.B #define _LARGEFILE64_SOURCE
+.B #define GD_64BIT_API
 
 .B #include <getdata.h>
 .HP
 .nh
 .ad l
-.BI "size_t gd_putdata64(DIRFILE *" dirfile ", const char *" field_code ", off64_t"
-.IB first_frame ", off64_t " first_sample ", size_t " num_frames ", size_t"
-.IB num_samples ", gd_type_t " data_type ", const void *" data_out );
+.BI "size_t gd_putdata64(DIRFILE *" dirfile ", const char *" field_code ,
+.BI "gd_off64_t " first_frame ", gd_off64_t " first_sample ", size_t 
+.IB num_frames ", size_t " num_samples ", gd_type_t " data_type ,
+.BI "const void *" data_out );
 .hy
 .ad n
 .SH DESCRIPTION
 This version of
 .BR gd_putdata (3)
-uses a 64-bit offset type, even if
-.I off_t
-is a 32-bit type.  It is only available if one defines
-.IR _LARGEFILE64_SOURCE .
+uses a 64-bit offset type
+.RB ( gd_off64_t ),
+where one is available, regardless of the size of
+.BR off_t .
+It is only available if one defines
+.IR GD_64BIT_API
+or
+.IR _LARGEFILE64_SOURCE
+before including getdata.h.
+
 If
 .I off_t
-is a 64-bit type (i.e. if
+is a 64-bit type (possibly because
 .I _FILE_OFFSET_BITS
-is defined to be 64), this function will be called
-.BR gd_putdata ().
+has been defined to 64), this function will the same as
+.BR gd_putdata (3).
 Otherwise,
-.BR gd_putdata ()
+.BR gd_putdata (3)
 will be a version of this function which uses a 32-bit
 .IR off_t .
 .SH SEE ALSO

Added: trunk/getdata/man/gd_seek64.3
===================================================================
--- trunk/getdata/man/gd_seek64.3	                        (rev 0)
+++ trunk/getdata/man/gd_seek64.3	2012-05-26 00:25:05 UTC (rev 713)
@@ -0,0 +1,55 @@
+.\" gd_seek64.3.  The gd_seek64 man page.
+.\"
+.\" Copyright (C) 2012 D. V. Wiebe
+.\"
+.\""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+.\"
+.\" This file is part of the GetData project.
+.\"
+.\" Permission is granted to copy, distribute and/or modify this document
+.\" under the terms of the GNU Free Documentation License, Version 1.2 or
+.\" any later version published by the Free Software Foundation; with no
+.\" Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+.\" Texts.  A copy of the license is included in the `COPYING.DOC' file
+.\" as part of this distribution.
+.\"
+.TH gd_seek64 3 "25 May 2012" "Version 0.8.0" "GETDATA"
+.SH NAME
+gd_seek64 \(em retrieve data from a dirfi...
 
[truncated message content]

Thread: [Getdata-commits] SF.net SVN: getdata:[713] trunk/getdata (Page 6)

Scientific Database Format

getdata-commits