Skip to content

Indentation fixes only. No actual changes. #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 27, 2019
Merged

Indentation fixes only. No actual changes. #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
119 changes: 59 additions & 60 deletions mpiP-hash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

Please see COPYRIGHT AND LICENSE information at the end of this file.

-----
-----

mpiP-hash.c -- generic hash table

Expand Down Expand Up @@ -90,15 +90,14 @@ h_insert (h_t * ht, void *ptr)
/* search list for similar key, if not, append it to list */
/* OPTIMIZATION: remove this and let users deal with it :) */
for (het_index = ht->table[tableIndex];
het_index != NULL; het_index = het_index->next)
{
if (ht->hc (het_index->ptr, ptr) == 0)
{
printf
("hash: warning: tried to insert identical entry again\n");
return 1;
}
}
het_index != NULL; het_index = het_index->next)
{
if (ht->hc (het_index->ptr, ptr) == 0)
{
printf("hash: warning: tried to insert identical entry again\n");
return 1;
}
}
het->next = ht->table[tableIndex];
ht->table[tableIndex] = het;
}
Expand Down Expand Up @@ -128,14 +127,14 @@ h_search (h_t * ht, void *key, void **ptr)
{
/* search list for similar key */
for (het_index = ht->table[tableIndex];
het_index != NULL; het_index = het_index->next)
{
if (ht->hc (het_index->ptr, key) == 0)
{
*ptr = het_index->ptr;
return *ptr;
}
}
het_index != NULL; het_index = het_index->next)
{
if (ht->hc (het_index->ptr, key) == 0)
{
*ptr = het_index->ptr;
return *ptr;
}
}
}
return NULL;
}
Expand All @@ -159,21 +158,21 @@ h_delete (h_t * ht, void *key, void **ptr)
{
/* search list for similar key */
for (het_index = ht->table[tableIndex],
next_addr = &(ht->table[tableIndex]);
het_index != NULL; het_index = het_index->next)
{
if (ht->hc (het_index->ptr, key) == 0)
{
/* match */
*ptr = het_index->ptr;
*next_addr = het_index->next;
free (het_index);
ht->count--;
return *ptr;
}

next_addr = &(het_index->next);
}
next_addr = &(ht->table[tableIndex]);
het_index != NULL; het_index = het_index->next)
{
if (ht->hc (het_index->ptr, key) == 0)
{
/* match */
*ptr = het_index->ptr;
*next_addr = het_index->next;
free (het_index);
ht->count--;
return *ptr;
}

next_addr = &(het_index->next);
}
}
return NULL;
}
Expand All @@ -193,14 +192,14 @@ h_gather_data (h_t * ht, int *ac, void ***ptr)
for (i = 0; i < ht->size; i++)
{
if (ht->table[i] != NULL)
{
for (het_index = ht->table[i];
het_index != NULL; het_index = het_index->next)
{
(*ptr)[*ac] = het_index->ptr;
(*ac)++;
}
}
{
for (het_index = ht->table[i];
het_index != NULL; het_index = het_index->next)
{
(*ptr)[*ac] = het_index->ptr;
(*ac)++;
}
}
}
return *ac;
}
Expand Down Expand Up @@ -255,9 +254,9 @@ main ()
for (i = 0; i < 20; i++) /* insert some elements */
{
if (NULL != h_insert (ht, &sr[i]))
{
printf ("%5d: inserted %d\n", i, sr[i].id);
}
{
printf ("%5d: inserted %d\n", i, sr[i].id);
}
}
printf ("-----\n");
{
Expand All @@ -266,7 +265,7 @@ main ()
h_gather_data (ht, &dc, (void ***) &dv); /* gather elements and print */
for (i = 0; i < dc; i++)
{
printf ("%5d: %d %d %d\n", i, dv[i]->id, dv[i]->size, dv[i]->order);
printf ("%5d: %d %d %d\n", i, dv[i]->id, dv[i]->size, dv[i]->order);
}
free (dv); /* remember to release return vector */
}
Expand All @@ -275,9 +274,9 @@ main ()
{
SampleRecord_t *d;
if (NULL != h_delete (ht, &sr[i], (void **) &d))
{
printf ("%5d: deleted %d\n", i, sr[i].id);
}
{
printf ("%5d: deleted %d\n", i, sr[i].id);
}
}

printf ("-----\n");
Expand All @@ -287,7 +286,7 @@ main ()
h_gather_data (ht, &dc, (void ***) &dv); /* gather elements and print */
for (i = 0; i < dc; i++)
{
printf ("%5d: %d %d %d\n", i, dv[i]->id, dv[i]->size, dv[i]->order);
printf ("%5d: %d %d %d\n", i, dv[i]->id, dv[i]->size, dv[i]->order);
}
free (dv); /* remember to release return vector */
}
Expand All @@ -297,9 +296,9 @@ main ()
{
SampleRecord_t *d;
if (NULL != h_delete (ht, &sr[i], (void **) &d))
{
printf ("%5d: deleted %d\n", i, sr[i].id);
}
{
printf ("%5d: deleted %d\n", i, sr[i].id);
}
}

h_close (ht);
Expand All @@ -318,13 +317,13 @@ Produced at the Lawrence Livermore National Laboratory
Written by Jeffery Vetter and Christopher Chambreau.
UCRL-CODE-223450.
All rights reserved.

This file is part of mpiP. For details, see http://llnl.github.io/mpiP.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the disclaimer below.

Expand All @@ -349,22 +348,22 @@ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


Additional BSD Notice

1. This notice is required to be provided under our contract with the
U.S. Department of Energy (DOE). This work was produced at the
University of California, Lawrence Livermore National Laboratory under
Contract No. W-7405-ENG-48 with the DOE.

2. Neither the United States Government nor the University of
California nor any of their employees, makes any warranty, express or
implied, or assumes any liability or responsibility for the accuracy,
completeness, or usefulness of any information, apparatus, product, or
process disclosed, or represents that its use would not infringe
privately-owned rights.

3. Also, reference herein to any specific commercial products,
process, or services by trade name, trademark, manufacturer or
otherwise does not necessarily constitute or imply its endorsement,
Expand Down
6 changes: 3 additions & 3 deletions mpiP-hash.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ typedef struct _h_t
{
int size;
int count;
h_HashFunct hf; /* given an element compute the hash number */
h_Comparator hc; /* given two elements, do they match? 0 for yes */
h_entry_t **table; /* table[size] of pointers to lists of entries */
h_HashFunct hf; /* given an element compute the hash number */
h_Comparator hc; /* given two elements, do they match? 0 for yes */
h_entry_t **table; /* table[size] of pointers to lists of entries */
}
h_t;

Expand Down
Loading