diff options
author | Scott Wegner <swegner@hdfgroup.org> | 2008-06-05 21:39:30 (GMT) |
---|---|---|
committer | Scott Wegner <swegner@hdfgroup.org> | 2008-06-05 21:39:30 (GMT) |
commit | 0b5f34bfa659d0cde87a1f120843f8003ee2a81b (patch) | |
tree | f0be04385aa11f4c7fd6c556d8ffaedf3b96bf60 /tools/h5jam/getub.c | |
parent | 13cc35de119303658b5facaf993632a4a57b15a4 (diff) | |
download | hdf5-0b5f34bfa659d0cde87a1f120843f8003ee2a81b.zip hdf5-0b5f34bfa659d0cde87a1f120843f8003ee2a81b.tar.gz hdf5-0b5f34bfa659d0cde87a1f120843f8003ee2a81b.tar.bz2 |
[svn-r15160] Purpose: Separate Windows function macro definitions to win32defs.h
Description:
In library code, we try not to use system calls directly, but instead use the HD{function} macro instead. This way, we can map special versions of the call on particular systems. Previously, it was all done in H5private.h. However, in an effort to clean up platform-specific definitions, we move all of the Windows macros into a separate file, win32defs.h. This way, we can use the non-Posix versions that Visual Studio sends warnings about.
Some macros are set specifically in the platform-specific header files. Then, any macros left unset will be set by the "default" implementation in H5private.h.
This checkin also cleans up various source files to use the HD* macros when possible.
Tested:
VS2005 on WinXP
VS.NET on WinXP
h5committest (kagiso, linew, smirom)
Diffstat (limited to 'tools/h5jam/getub.c')
-rw-r--r-- | tools/h5jam/getub.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/h5jam/getub.c b/tools/h5jam/getub.c index 52e349e..2fb5833 100644 --- a/tools/h5jam/getub.c +++ b/tools/h5jam/getub.c @@ -85,7 +85,7 @@ parse_command_line (int argc, const char *argv[]) switch ((char) opt) { case 'c': - nbytes = strdup (opt_arg); + nbytes = HDstrdup (opt_arg); break; case '?': default: @@ -126,7 +126,7 @@ main (int argc, const char *argv[]) usage (progname); exit (EXIT_FAILURE); } - filename = strdup (argv[opt_ind]); + filename = HDstrdup (argv[opt_ind]); size = 0; res = sscanf (nbytes, "%u", &size); @@ -148,7 +148,7 @@ main (int argc, const char *argv[]) buf = malloc ((unsigned)(size + 1)); if (buf == NULL) { - close (fd); + HDclose (fd); exit (EXIT_FAILURE); } @@ -158,7 +158,7 @@ main (int argc, const char *argv[]) { if (buf) free (buf); - close (fd); + HDclose (fd); exit (EXIT_FAILURE); } @@ -166,6 +166,6 @@ main (int argc, const char *argv[]) if (buf) free (buf); - close (fd); + HDclose (fd); return (EXIT_SUCCESS); } |