diff options
| -rw-r--r-- | src/H5.c | 62 | ||||
| -rw-r--r-- | src/H5Zfletcher32.c | 6 |
2 files changed, 33 insertions, 35 deletions
@@ -288,7 +288,7 @@ done: H5_API_UNLOCK #endif return; -} +} /* end H5_term_library() */ /*------------------------------------------------------------------------- @@ -330,7 +330,7 @@ H5dont_atexit(void) H5_dont_atexit_g = TRUE; FUNC_LEAVE_API(ret_value) -} +} /* end H5dont_atexit() */ /*------------------------------------------------------------------------- @@ -506,7 +506,7 @@ H5_debug_mask(const char *s) s++; } } -} +} /* end H5_debug_mask() */ /*------------------------------------------------------------------------- @@ -547,7 +547,7 @@ H5get_libversion(unsigned *majnum, unsigned *minnum, unsigned *relnum) done: FUNC_LEAVE_API(ret_value) -} +} /* end H5get_libversion() */ /*------------------------------------------------------------------------- @@ -673,7 +673,7 @@ H5check_version(unsigned majnum, unsigned minnum, unsigned relnum) done: FUNC_LEAVE_API(ret_value) -} +} /* end H5check_version() */ /*------------------------------------------------------------------------- @@ -703,7 +703,7 @@ H5open(void) /* all work is done by FUNC_ENTER() */ done: FUNC_LEAVE_API(ret_value) -} +} /* end H5open() */ /*------------------------------------------------------------------------- @@ -734,7 +734,7 @@ H5close(void) H5_term_library(); FUNC_LEAVE_API_NOFS(SUCCEED) -} +} /* end H5close() */ /*------------------------------------------------------------------------- @@ -1054,7 +1054,7 @@ HDfprintf(FILE *stream, const char *fmt, ...) } va_end (ap); return nout; -} +} /* end HDfprintf() */ /*------------------------------------------------------------------------- @@ -1169,7 +1169,7 @@ HDstrtoll(const char *s, const char **rest, int base) acc *= sign; if (rest) *rest = s; return acc; -} +} /* end HDstrtoll() */ /*------------------------------------------------------------------------- @@ -1192,7 +1192,7 @@ H5_timer_reset (H5_timer_t *timer) { assert (timer); HDmemset (timer, 0, sizeof *timer); -} +} /* end H5_timer_reset() */ /*------------------------------------------------------------------------- @@ -1237,7 +1237,7 @@ H5_timer_begin (H5_timer_t *timer) #else timer->etime = 0.0; #endif -} +} /* end H5_timer_begin() */ /*------------------------------------------------------------------------- @@ -1274,7 +1274,7 @@ H5_timer_end (H5_timer_t *sum/*in,out*/, H5_timer_t *timer/*in,out*/) sum->stime += timer->stime; sum->etime += timer->etime; } -} +} /* end H5_timer_end() */ /*------------------------------------------------------------------------- @@ -1342,7 +1342,7 @@ H5_bandwidth(char *buf/*out*/, double nbytes, double nseconds) } } } -} +} /* end H5_bandwidth() */ /*------------------------------------------------------------------------- @@ -3128,8 +3128,9 @@ H5_trace (const double *returning, const char *func, const char *type, ...) } HDfflush (out); return event_time.etime; -} +} /* end H5_trace() */ + /*------------------------------------------------------------------------- * Function: HDrand/HDsrand * @@ -3147,7 +3148,6 @@ H5_trace (const double *returning, const char *func, const char *type, ...) * Programmer: Leon Arber * March 6, 2006. * - * Modifications: *------------------------------------------------------------------------- */ #ifdef H5_HAVE_RAND_R @@ -3163,8 +3163,9 @@ void HDsrand(unsigned int seed) { g_seed = seed; } - #endif + + /*------------------------------------------------------------------------- * Function: HDremove_all * @@ -3179,25 +3180,24 @@ void HDsrand(unsigned int seed) * Programmer: Elena Pourmal * March 22, 2006 * - * Modifications: *------------------------------------------------------------------------- */ #ifdef H5_VMS - - -int HDremove_all(char *fname) +int +HDremove_all(char *fname) { - int ret_value = -1; - char *_fname; - _fname = malloc(strlen(fname)+3); /* to accomodate ;* and null */ - if(_fname) { - strcpy(_fname, fname); - strcat(_fname,";*"); - remove(_fname); - free(_fname); - ret_value = 0; - } - return ret_value; + int ret_value = -1; + char *_fname; + + _fname = H5MM_malloc(HDstrlen(fname) + 3); /* to accomodate ;* and null */ + if(_fname) { + HDstrcpy(_fname, fname); + HDstrcat(_fname,";*"); + HDremove(_fname); + H5MM_xfree(_fname); + ret_value = 0; + } + return ret_value; } #endif diff --git a/src/H5Zfletcher32.c b/src/H5Zfletcher32.c index b0c120a..770d05a 100644 --- a/src/H5Zfletcher32.c +++ b/src/H5Zfletcher32.c @@ -64,13 +64,10 @@ const H5Z_class_t H5Z_FLETCHER32[1] = {{ * *------------------------------------------------------------------------- */ - static uint32_t H5Z_filter_fletcher32_compute(void *_src, size_t len) { unsigned char *src=(unsigned char *)_src; - /*To handle unusual platforms like Cray*/ - unsigned short tmp_src; size_t count = len; /* Number of bytes left to checksum */ uint32_t s1 = 0, s2 = 0; /* Temporary partial checksums */ @@ -78,8 +75,8 @@ H5Z_filter_fletcher32_compute(void *_src, size_t len) /* Compute checksum */ while(count > 1) { + unsigned short tmp_src; /*To handle unusual platforms like Cray*/ - /*To handle unusual platforms like Cray*/ tmp_src = (((unsigned short)src[0])<<8) | ((unsigned short)src[1]); src +=2; s1 += tmp_src; @@ -96,6 +93,7 @@ H5Z_filter_fletcher32_compute(void *_src, size_t len) count -= 2; } + /* Check for single byte remaining */ if(count==1) { s1 += *(unsigned char*)src; if(s1 & 0xFFFF0000) { /*Wrap around carry if occurred*/ |