From fcd5fc141f0a6e88f683581be67b574759c24f43 Mon Sep 17 00:00:00 2001 From: Neil Fortner Date: Tue, 9 Dec 2008 14:53:01 -0500 Subject: [svn-r16176] Remove terminal whitespace in links.c, H5Lexternal.c, H5Pfapl.c Tested: jam --- src/H5Lexternal.c | 4 ++-- src/H5Plapl.c | 10 +++++----- test/links.c | 44 ++++++++++++++++++++++---------------------- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/H5Lexternal.c b/src/H5Lexternal.c index d5a441d..46ed467 100644 --- a/src/H5Lexternal.c +++ b/src/H5Lexternal.c @@ -171,11 +171,11 @@ done: * Vailin Choi, April 2, 2008 * Add handling to search for the target file * See description in RM: H5Lcreate_external - * + * * Vailin Choi; Sept. 12th, 2008; bug #1247 * Retrieve the file access property list identifer that is set * for link access property via H5Pget_elink_fapl(). - * If the return value is H5P_DEFAULT, the parent's file access + * If the return value is H5P_DEFAULT, the parent's file access * property is used to H5F_open() the target file; * Otherwise, the file access property retrieved from H5Pget_elink_fapl() * is used to H5F_open() the target file. diff --git a/src/H5Plapl.c b/src/H5Plapl.c index a572df3..e3f2333 100644 --- a/src/H5Plapl.c +++ b/src/H5Plapl.c @@ -226,7 +226,7 @@ H5P_lacc_elink_fapl_copy(const char UNUSED *name, size_t UNUSED size, void *valu l_fapl_id = (*(const hid_t *)value); if(l_fapl_id > H5P_DEFAULT) { - H5P_genplist_t *l_fapl_plist; + H5P_genplist_t *l_fapl_plist; if(NULL == (l_fapl_plist = (H5P_genplist_t *)H5P_object_verify(l_fapl_id, H5P_FILE_ACCESS))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get property list") @@ -547,10 +547,10 @@ done: * Function: H5Pset_elink_fapl * * Purpose: Sets the file access property list for link access - * + * * Return: Non-negative on success/Negative on failure * - * Programmer: + * Programmer: * Vailin Choi; Tuesday, September 12th, 2008 * *------------------------------------------------------------------------- @@ -559,7 +559,7 @@ herr_t H5Pset_elink_fapl(hid_t lapl_id, hid_t fapl_id) { H5P_genplist_t *plist, *l_fapl_plist, *fapl_plist; /* Property list pointer */ - hid_t l_fapl_id, new_fapl_id; + hid_t l_fapl_id, new_fapl_id; herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Pset_elink_fapl, FAIL) @@ -601,7 +601,7 @@ done: * * Return: Non-negative on success/Negative on failure * - * Programmer: + * Programmer: * Vailin Choi; Tuesday, September 12th, 2008 * *------------------------------------------------------------------------- diff --git a/test/links.c b/test/links.c index 2c90796..433e9f8 100644 --- a/test/links.c +++ b/test/links.c @@ -74,8 +74,8 @@ const char *FILENAME[] = { "tmp/extlinks14", /* 35: */ "tmp/extlinks15", /* 36: */ "extlinks16A", /* 37: */ /* TESTS for H5P_set_elink_fapl */ - "extlinks16B", /* 38: */ - "extlinks17", /* 39: */ + "extlinks16B", /* 38: */ + "extlinks17", /* 39: */ NULL }; @@ -3478,7 +3478,7 @@ external_link_chdir(hid_t fapl, hbool_t new_format) * * Purpose: To verify that the external linked target file with physical layout * different from the parent can be successfully opened. - * + * * 1. target link: "extlinks16" * 2. target file: "extlinks16" * 3. main file: Linux:"/CWD/tmp/extlinks0"; Window: ":/CWD/tmp/extlinks0" @@ -3503,9 +3503,9 @@ static int external_set_elink_fapl1(hid_t fapl, hbool_t new_format) { hid_t fid=(-1); - hid_t fidA=(-1), fidB=(-1); - hid_t gidA=(-1), gidB=(-1); - hid_t oidA=(-1), oidB=(-1); + hid_t fidA=(-1), fidB=(-1); + hid_t gidA=(-1), gidB=(-1); + hid_t oidA=(-1), oidB=(-1); char filename1[NAME_BUF_SIZE], filename2A[NAME_BUF_SIZE], filename2B[NAME_BUF_SIZE], @@ -3524,15 +3524,15 @@ external_set_elink_fapl1(hid_t fapl, hbool_t new_format) else TESTING("H5Pset/get_elink_fapl() with different physical layouts") - if ((HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST) || + if ((HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST) || (HDgetcwd(cwdpath, NAME_BUF_SIZE)==NULL)) TEST_ERROR - /* - * set up name for main file: - * Linux: "/CWD/tmp/extlinks0" + /* + * set up name for main file: + * Linux: "/CWD/tmp/extlinks0" * Windows: ":/CWD/tmp/extlinks0" - */ + */ HDstrcpy(tmpname, cwdpath); HDstrcat(tmpname, "/"); HDstrcat(tmpname, FILENAME[13]); @@ -3567,7 +3567,7 @@ external_set_elink_fapl1(hid_t fapl, hbool_t new_format) sprintf(sv[H5FD_MEM_SUPER], "%%s-%c.h5", 's'); memb_name[H5FD_MEM_SUPER] = sv[H5FD_MEM_SUPER]; memb_addr[H5FD_MEM_SUPER] = 0; - + sprintf(sv[H5FD_MEM_BTREE], "%%s-%c.h5", 'b'); memb_name[H5FD_MEM_BTREE] = sv[H5FD_MEM_BTREE]; memb_addr[H5FD_MEM_BTREE] = HADDR_MAX/6; @@ -3615,10 +3615,10 @@ external_set_elink_fapl1(hid_t fapl, hbool_t new_format) if((fid=H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR /* Create external link to target file A:/A */ - if(H5Lcreate_external(filename2A, "/A", fid, "ext_linkA", H5P_DEFAULT, H5P_DEFAULT) < 0) + if(H5Lcreate_external(filename2A, "/A", fid, "ext_linkA", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR /* Create external link to target file B:/B */ - if(H5Lcreate_external(filename2B, "/B", fid, "ext_linkB", H5P_DEFAULT, H5P_DEFAULT) < 0) + if(H5Lcreate_external(filename2B, "/B", fid, "ext_linkB", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR /* Set file access property list for link access to use the family driver */ @@ -3681,7 +3681,7 @@ external_set_elink_fapl1(hid_t fapl, hbool_t new_format) * Function: external_set_elink_fapl2: test 11 * * Purpose: To verify that processing done to the external linked target object is - * correctly handled when the parent and target files have the same + * correctly handled when the parent and target files have the same * physical layout but different access methods. * * 1. target link: "extlinks17" @@ -3726,15 +3726,15 @@ external_set_elink_fapl2(hid_t fapl, hbool_t new_format) else TESTING("H5Pset/get_elink_fapl() with same physical layout") - if ((HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST) || + if ((HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST) || (HDgetcwd(cwdpath, NAME_BUF_SIZE)==NULL)) TEST_ERROR - /* - * set up name for main file: - * Linux: "/CWD/tmp/extlinks0" + /* + * set up name for main file: + * Linux: "/CWD/tmp/extlinks0" * Windows: ":/CWD/tmp/extlinks0" - */ + */ HDstrcpy(tmpname, cwdpath); HDstrcat(tmpname, "/"); HDstrcat(tmpname, FILENAME[13]); @@ -3762,7 +3762,7 @@ external_set_elink_fapl2(hid_t fapl, hbool_t new_format) if(H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_LATE) < 0) TEST_ERROR; /* create "Dataset" in group "A" of target file */ - if((dset = H5Dcreate2(gid, "Dataset", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) + if((dset = H5Dcreate2(gid, "Dataset", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) TEST_ERROR /* closing for target file */ @@ -3779,7 +3779,7 @@ external_set_elink_fapl2(hid_t fapl, hbool_t new_format) if((fid=H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR /* Create external link to target file: ext_link->extlinks17:/A/Dataset */ - if(H5Lcreate_external(filename2, "/A/Dataset", fid, "ext_link", H5P_DEFAULT, H5P_DEFAULT) < 0) + if(H5Lcreate_external(filename2, "/A/Dataset", fid, "ext_link", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR /* create fapl to be a "core" file without backing store */ -- cgit v0.12