mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-01-18 15:15:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removes remaining register keywords (#1481)

Browse Source
This commit is contained in:
Dana Robinson 2022-03-10 14:14:05 -08:00 committed by GitHub
parent 1fb3743f04
commit 01209d2777
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 91 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
hl/tools/gif2h5/gif2mem.c
View File

@ -49,22 +49,22 @@ Gif2Mem(GIFBYTE *MemGif, GIFTOMEM *GifMemoryStruct)
GIFCOMMENT ** gifComment; /* Comment Extension structure */
GIFGRAPHICCONTROL **gifGraphicControl; /* Graphic Control Extension strct */
register GIFWORD i; /* Loop counter */
GIFBYTE Identifier; /* Extension block identifier holder */
GIFBYTE Label; /* Extension block label holder */
GIFBYTE ImageCount; /* Count of the number of images in the file */
GIFBYTE ImageArray; /* Keep the size of the array to store Images */
GIFBYTE CommentCount;
GIFBYTE CommentArray;
GIFBYTE ApplicationCount;
GIFBYTE ApplicationArray;
GIFBYTE PlainTextCount;
GIFBYTE PlainTextArray;
GIFBYTE GCEflag;
GIFBYTE aTemp;
GIFBYTE j;
GIFBYTE w; /* Two more variables needed only while testing */
GIFBYTE * b; /* Endian Ordering */
GIFWORD i; /* Loop counter */
GIFBYTE Identifier; /* Extension block identifier holder */
GIFBYTE Label; /* Extension block label holder */
GIFBYTE ImageCount; /* Count of the number of images in the file */
GIFBYTE ImageArray; /* Keep the size of the array to store Images */
GIFBYTE CommentCount;
GIFBYTE CommentArray;
GIFBYTE ApplicationCount;
GIFBYTE ApplicationArray;
GIFBYTE PlainTextCount;
GIFBYTE PlainTextArray;
GIFBYTE GCEflag;
GIFBYTE aTemp;
GIFBYTE j;
GIFBYTE w; /* Two more variables needed only while testing */
GIFBYTE *b; /* Endian Ordering */
/* Allocate memory for the GIF structures */
/* Plug the structs into GifMemoryStruct at the end */

14
hl/tools/gif2h5/hdfgifwr.c
View File

@ -188,13 +188,13 @@ hdfWriteGIF(FILE *fp, byte *pic, int ptype, int w, int h, const byte *rmap, cons
static void
compress(int init_bits, FILE *outfile, byte *data, int len)
{
register long fcode;
register int i = 0;
register int c;
register int ent;
register int disp;
register int hsize_reg;
register int hshift;
long fcode;
int i = 0;
int c;
int ent;
int disp;
int hsize_reg;
int hshift;
/*
* Set up the globals: g_init_bits - initial number of bits g_outfile -

2
tools/lib/h5tools.c
View File

@ -1052,7 +1052,7 @@ done:
H5_ATTR_PURE static size_t
h5tools_count_ncols(const char *s)
{
register size_t i;
size_t i;
for (i = 0; *s; s++)
if (*s >= ' ')

8
tools/lib/h5tools_str.c
View File

@ -1401,10 +1401,10 @@ h5tools_str_sprint_reference(h5tools_str_t *str, H5R_ref_t *ref_vp)
static char *
h5tools_escape(char *s /*in,out*/, size_t size)
{
register size_t i;
const char * escape;
char octal[8];
size_t n = HDstrlen(s);
size_t i;
const char *escape;
char octal[8];
size_t n = HDstrlen(s);
for (i = 0; i < n; i++) {
switch (s[i]) {

2
tools/src/h5perf/pio_engine.c
View File

@ -420,7 +420,7 @@ pio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si
/* If the prefix specifies the HDF5_PARAPREFIX directory, then
* default to using the "/tmp/$USER" or "/tmp/$LOGIN"
* directory instead. */
register char *user, *login, *subdir;
char *user, *login, *subdir;
user = HDgetenv("USER");
login = HDgetenv("LOGIN");

65
tools/src/h5perf/pio_perf.c
View File

@ -200,7 +200,7 @@ static void output_results(const struct options *options, const char *name, min
off_t data_size);
static void output_times(const struct options *options, const char *name, minmax *table, int table_size);
static void output_report(const char *fmt, ...);
static void print_indent(register int indent);
static void print_indent(int indent);
static void usage(const char *prog);
static void report_parameters(struct options *opts);
static off_t squareo(off_t);
@ -336,7 +336,7 @@ run_test_loop(struct options *opts)
/* start with max_num_procs and decrement it by half for each loop. */
/* if performance needs restart, fewer processes may be needed. */
for (num_procs = opts->max_num_procs; num_procs >= opts->min_num_procs; num_procs >>= 1) {
register size_t buf_size;
size_t buf_size;
parms.num_procs = num_procs;
@ -411,34 +411,34 @@ run_test_loop(struct options *opts)
static int
run_test(iotype iot, parameters parms, struct options *opts)
{
results res;
register int i, ret_value = SUCCESS;
int comm_size;
off_t raw_size;
minmax * write_mpi_mm_table = NULL;
minmax * write_mm_table = NULL;
minmax * write_gross_mm_table = NULL;
minmax * write_raw_mm_table = NULL;
minmax * read_mpi_mm_table = NULL;
minmax * read_mm_table = NULL;
minmax * read_gross_mm_table = NULL;
minmax * read_raw_mm_table = NULL;
minmax * read_open_mm_table = NULL;
minmax * read_close_mm_table = NULL;
minmax * write_open_mm_table = NULL;
minmax * write_close_mm_table = NULL;
minmax write_mpi_mm = {0.0, 0.0, 0.0, 0};
minmax write_mm = {0.0, 0.0, 0.0, 0};
minmax write_gross_mm = {0.0, 0.0, 0.0, 0};
minmax write_raw_mm = {0.0, 0.0, 0.0, 0};
minmax read_mpi_mm = {0.0, 0.0, 0.0, 0};
minmax read_mm = {0.0, 0.0, 0.0, 0};
minmax read_gross_mm = {0.0, 0.0, 0.0, 0};
minmax read_raw_mm = {0.0, 0.0, 0.0, 0};
minmax read_open_mm = {0.0, 0.0, 0.0, 0};
minmax read_close_mm = {0.0, 0.0, 0.0, 0};
minmax write_open_mm = {0.0, 0.0, 0.0, 0};
minmax write_close_mm = {0.0, 0.0, 0.0, 0};
results res;
int i, ret_value = SUCCESS;
int comm_size;
off_t raw_size;
minmax *write_mpi_mm_table = NULL;
minmax *write_mm_table = NULL;
minmax *write_gross_mm_table = NULL;
minmax *write_raw_mm_table = NULL;
minmax *read_mpi_mm_table = NULL;
minmax *read_mm_table = NULL;
minmax *read_gross_mm_table = NULL;
minmax *read_raw_mm_table = NULL;
minmax *read_open_mm_table = NULL;
minmax *read_close_mm_table = NULL;
minmax *write_open_mm_table = NULL;
minmax *write_close_mm_table = NULL;
minmax write_mpi_mm = {0.0, 0.0, 0.0, 0};
minmax write_mm = {0.0, 0.0, 0.0, 0};
minmax write_gross_mm = {0.0, 0.0, 0.0, 0};
minmax write_raw_mm = {0.0, 0.0, 0.0, 0};
minmax read_mpi_mm = {0.0, 0.0, 0.0, 0};
minmax read_mm = {0.0, 0.0, 0.0, 0};
minmax read_gross_mm = {0.0, 0.0, 0.0, 0};
minmax read_raw_mm = {0.0, 0.0, 0.0, 0};
minmax read_open_mm = {0.0, 0.0, 0.0, 0};
minmax read_close_mm = {0.0, 0.0, 0.0, 0};
minmax write_open_mm = {0.0, 0.0, 0.0, 0};
minmax write_close_mm = {0.0, 0.0, 0.0, 0};
raw_size = parms.num_files * (off_t)parms.num_dsets * (off_t)parms.num_bytes;
parms.io_type = iot;
@ -1098,10 +1098,9 @@ output_report(const char *fmt, ...)
* things.
* Return: Nothing
* Programmer: Bill Wendling, 29. October 2001
* Modifications:
*/
static void
print_indent(register int indent)
print_indent(int indent)
{
int myrank;
@ -1278,7 +1277,7 @@ report_parameters(struct options *opts)
static struct options *
parse_command_line(int argc, const char *const *argv)
{
register int opt;
int opt;
struct options *cl_opts;
cl_opts = (struct options *)malloc(sizeof(struct options));

2
tools/src/h5perf/sio_engine.c
View File

@ -328,7 +328,7 @@ sio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si
/* If the prefix specifies the HDF5_PREFIX directory, then
* default to using the "/tmp/$USER" or "/tmp/$LOGIN"
* directory instead. */
register char *user, *login, *subdir;
char *user, *login, *subdir;
user = HDgetenv("USER");
login = HDgetenv("LOGIN");

43
tools/src/h5perf/sio_perf.c
View File

@ -173,7 +173,7 @@ static void accumulate_minmax_stuff(const minmax *mm, int count, minm
static void output_results(const struct options *options, const char *name, minmax *table, int table_size,
off_t data_size);
static void output_report(const char *fmt, ...);
static void print_indent(register int indent);
static void print_indent(int indent);
static void usage(const char *prog);
static void report_parameters(struct options *opts);
@ -299,25 +299,25 @@ run_test_loop(struct options *opts)
static int
run_test(iotype iot, parameters parms, struct options *opts)
{
results res;
register int i, ret_value = SUCCESS;
off_t raw_size;
minmax * write_sys_mm_table = NULL;
minmax * write_mm_table = NULL;
minmax * write_gross_mm_table = NULL;
minmax * write_raw_mm_table = NULL;
minmax * read_sys_mm_table = NULL;
minmax * read_mm_table = NULL;
minmax * read_gross_mm_table = NULL;
minmax * read_raw_mm_table = NULL;
minmax write_sys_mm = {0.0, 0.0, 0.0, 0};
minmax write_mm = {0.0, 0.0, 0.0, 0};
minmax write_gross_mm = {0.0, 0.0, 0.0, 0};
minmax write_raw_mm = {0.0, 0.0, 0.0, 0};
minmax read_sys_mm = {0.0, 0.0, 0.0, 0};
minmax read_mm = {0.0, 0.0, 0.0, 0};
minmax read_gross_mm = {0.0, 0.0, 0.0, 0};
minmax read_raw_mm = {0.0, 0.0, 0.0, 0};
results res;
int i, ret_value = SUCCESS;
off_t raw_size;
minmax *write_sys_mm_table = NULL;
minmax *write_mm_table = NULL;
minmax *write_gross_mm_table = NULL;
minmax *write_raw_mm_table = NULL;
minmax *read_sys_mm_table = NULL;
minmax *read_mm_table = NULL;
minmax *read_gross_mm_table = NULL;
minmax *read_raw_mm_table = NULL;
minmax write_sys_mm = {0.0, 0.0, 0.0, 0};
minmax write_mm = {0.0, 0.0, 0.0, 0};
minmax write_gross_mm = {0.0, 0.0, 0.0, 0};
minmax write_raw_mm = {0.0, 0.0, 0.0, 0};
minmax read_sys_mm = {0.0, 0.0, 0.0, 0};
minmax read_mm = {0.0, 0.0, 0.0, 0};
minmax read_gross_mm = {0.0, 0.0, 0.0, 0};
minmax read_raw_mm = {0.0, 0.0, 0.0, 0};
raw_size = (off_t)parms.num_bytes;
parms.io_type = iot;
@ -657,10 +657,9 @@ output_report(const char *fmt, ...)
* things.
* Return: Nothing
* Programmer: Bill Wendling, 29. October 2001
* Modifications:
*/
static void
print_indent(register int indent)
print_indent(int indent)
{
indent *= TAB_SPACE;

6
tools/test/h5dump/h5dumpgentest.c
View File

@ -3914,9 +3914,9 @@ gent_multi(void)
static void
gent_large_objname(void)
{
hid_t fid, group, group2;
char grp_name[128];
register int i;
hid_t fid, group, group2;
char grp_name[128];
int i;
fid = H5Fcreate(FILE37, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);

2
tools/test/perform/pio_standalone.c
View File

@ -92,7 +92,7 @@ get_option(int argc, const char **argv, const char *opts, const struct h5_long_o
sp = 1;
}
else {
register char *cp; /* pointer into current token */
char *cp; /* pointer into current token */
/* short command line option */
opt_opt = argv[H5_optind][sp];

2
tools/test/perform/sio_standalone.c
View File

@ -92,7 +92,7 @@ get_option(int argc, const char **argv, const char *opts, const struct h5_long_o
sp = 1;
}
else {
register char *cp; /* pointer into current token */
char *cp; /* pointer into current token */
/* short command line option */
opt_opt = argv[H5_optind][sp];

6
tools/test/perform/zip_perf.c
View File

@ -336,8 +336,8 @@ parse_size_directive(const char *size)
static void
fill_with_random_data(Bytef *src, uLongf src_len)
{
register unsigned u;
h5_stat_t stat_buf;
unsigned u;
h5_stat_t stat_buf;
if (HDstat("/dev/urandom", &stat_buf) == 0) {
uLongf len = src_len;
@ -386,7 +386,7 @@ do_write_test(unsigned long file_size, unsigned long min_buf_size, unsigned long
Bytef * src;
for (src_len = min_buf_size; src_len <= max_buf_size; src_len <<= 1) {
register unsigned long i, iters;
unsigned long i, iters;
iters = file_size / src_len;
src = (Bytef *)HDcalloc(1, sizeof(Bytef) * src_len);