Attachment #807892 for bug #862717

View | Details | Raw Unified | Return to bug 862717
Collapse All | Expand All




  switch (linfo->type) {
    case H5L_TYPE_HARD: {

      H5O_info1_t objinfo;
      if( H5Oget_info_by_name1( group_id, member_name, &objinfo, H5P_DEFAULT ) < 0 ) {
	return (herr_t)HANDLE_H5G_GET_OBJINFO_ERR ( member_name );
      }


          free(targbuf);

          // Open the linked object. 
          H5O_info1_t objinfo;
          hid_t obj_id = H5Oopen(group_id, member_name, H5P_DEFAULT);
          if ( obj_id < 0 ) {
	    return (herr_t)HANDLE_H5G_OPEN_ERR ( member_name );
          }
          else if ( H5Oget_info1 ( obj_id, &objinfo ) < 0 ) {
	    return (herr_t)HANDLE_H5G_GET_OBJINFO_ERR ( member_name );
          }
          else {

		if ( obj_id < 0 )
			return (herr_t)HANDLE_H5G_OPEN_ERR ( member_name );

		herr = H5Oget_info1 ( obj_id, &objinfo );
		if ( herr < 0 )
			return (herr_t)HANDLE_H5G_GET_OBJINFO_ERR ( member_name );


Lines 664-673 Link Here

(-)A/test/testframe.c (-2 / +2 lines)
664	hid_t list = malloc(sizeof(hid_t)nopen);	664	hid_t list = malloc(sizeof(hid_t)nopen);
665	H5Fget_obj_ids(file->file, H5F_OBJ_ALL, nopen, list);	665	H5Fget_obj_ids(file->file, H5F_OBJ_ALL, nopen, list);
666		666
667	H5O_info_t info;	667	H5O_info1_t info;
668	int i;	668	int i;
669	for (i=0; i<nopen; i++) {	669	for (i=0; i<nopen; i++) {
670	H5Oget_info(list[i], &info);	670	H5Oget_info1(list[i], &info);
671	switch (info.type) {	671	switch (info.type) {
672	case H5O_TYPE_GROUP:	672	case H5O_TYPE_GROUP:
673	TestErrPrintf("obj%d has type GROUP\n", i);	673	TestErrPrintf("obj%d has type GROUP\n", i);

Return to bug 862717

Lines 2091-2098 Link Here

(-)A/src/H5Part.c (-5 / +5 lines)
2091	switch (linfo->type) {	2091	switch (linfo->type) {
2092	case H5L_TYPE_HARD: {	2092	case H5L_TYPE_HARD: {
2093		2093
2094	H5O_info_t objinfo;	2094	H5O_info1_t objinfo;
2095	if( H5Oget_info_by_name( group_id, member_name, &objinfo, H5P_DEFAULT ) < 0 ) {	2095	if( H5Oget_info_by_name1( group_id, member_name, &objinfo, H5P_DEFAULT ) < 0 ) {
2096	return (herr_t)HANDLE_H5G_GET_OBJINFO_ERR ( member_name );	2096	return (herr_t)HANDLE_H5G_GET_OBJINFO_ERR ( member_name );
2097	}	2097	}
2098		2098
Lines 2137-2148 Link Here
2137	free(targbuf);	2137	free(targbuf);
2138		2138
2139	// Open the linked object.	2139	// Open the linked object.
2140	H5O_info_t objinfo;	2140	H5O_info1_t objinfo;
2141	hid_t obj_id = H5Oopen(group_id, member_name, H5P_DEFAULT);	2141	hid_t obj_id = H5Oopen(group_id, member_name, H5P_DEFAULT);
2142	if ( obj_id < 0 ) {	2142	if ( obj_id < 0 ) {
2143	return (herr_t)HANDLE_H5G_OPEN_ERR ( member_name );	2143	return (herr_t)HANDLE_H5G_OPEN_ERR ( member_name );
2144	}	2144	}
2145	else if ( H5Oget_info ( obj_id, &objinfo ) < 0 ) {	2145	else if ( H5Oget_info1 ( obj_id, &objinfo ) < 0 ) {
2146	return (herr_t)HANDLE_H5G_GET_OBJINFO_ERR ( member_name );	2146	return (herr_t)HANDLE_H5G_GET_OBJINFO_ERR ( member_name );
2147	}	2147	}
2148	else {	2148	else {
Lines 2207-2213 Link Here
2207	if ( obj_id < 0 )	2207	if ( obj_id < 0 )
2208	return (herr_t)HANDLE_H5G_OPEN_ERR ( member_name );	2208	return (herr_t)HANDLE_H5G_OPEN_ERR ( member_name );
2209		2209
2210	herr = H5Oget_info ( obj_id, &objinfo );	2210	herr = H5Oget_info1 ( obj_id, &objinfo );
2211	if ( herr < 0 )	2211	if ( herr < 0 )
2212	return (herr_t)HANDLE_H5G_GET_OBJINFO_ERR ( member_name );	2212	return (herr_t)HANDLE_H5G_GET_OBJINFO_ERR ( member_name );
2213		2213