From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from krisdoz.my.domain (schwarze@localhost [127.0.0.1]) by krisdoz.my.domain (8.14.5/8.14.5) with ESMTP id s5K2A5JJ031155 for ; Thu, 19 Jun 2014 22:10:05 -0400 (EDT) Received: (from schwarze@localhost) by krisdoz.my.domain (8.14.5/8.14.3/Submit) id s5K2A5LP024641; Thu, 19 Jun 2014 22:10:05 -0400 (EDT) Date: Thu, 19 Jun 2014 22:10:05 -0400 (EDT) Message-Id: <201406200210.s5K2A5LP024641@krisdoz.my.domain> X-Mailinglist: mdocml-source Reply-To: source@mdocml.bsd.lv MIME-Version: 1.0 From: schwarze@mdocml.bsd.lv To: source@mdocml.bsd.lv Subject: mdocml: sync to OpenBSD: whitespace and comment changes, no functional X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/ Content-Type: text/plain; charset=utf-8 Log Message: ----------- sync to OpenBSD: whitespace and comment changes, no functional change Modified Files: -------------- mdocml: compat_ohash.c compat_ohash.h Revision Data ------------- Index: compat_ohash.h =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/compat_ohash.h,v retrieving revision 1.2 retrieving revision 1.3 diff -Lcompat_ohash.h -Lcompat_ohash.h -u -p -r1.2 -r1.3 --- compat_ohash.h +++ compat_ohash.h @@ -1,8 +1,4 @@ -#ifndef OHASH_H -#define OHASH_H -/* $OpenBSD: ohash.h,v 1.9 2006/01/16 15:52:25 espie Exp $ */ -/* ex:ts=8 sw=4: - */ +/* $OpenBSD: ohash.h,v 1.2 2014/06/02 18:52:03 deraadt Exp $ */ /* Copyright (c) 1999, 2004 Marc Espie * @@ -19,11 +15,15 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#ifndef OHASH_H +#define OHASH_H + /* Open hashing support. * Open hashing was chosen because it is much lighter than other hash * techniques, and more efficient in most cases. */ +/* user-visible data structure */ struct ohash_info { ptrdiff_t key_offset; void *data; /* user data */ @@ -34,6 +34,7 @@ struct ohash_info { struct _ohash_record; +/* private structure. It's there just so you can do a sizeof */ struct ohash { struct _ohash_record *t; struct ohash_info info; Index: compat_ohash.c =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/compat_ohash.c,v retrieving revision 1.2 retrieving revision 1.3 diff -Lcompat_ohash.c -Lcompat_ohash.c -u -p -r1.2 -r1.3 --- compat_ohash.c +++ compat_ohash.c @@ -8,7 +8,22 @@ int dummy; #else -/* $OpenBSD: ohash_int.h,v 1.3 2006/01/16 15:52:25 espie Exp $ */ +/* $OpenBSD: ohash.c,v 1.1 2014/06/02 18:52:03 deraadt Exp $ */ + +/* Copyright (c) 1999, 2004 Marc Espie + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ #include #include @@ -18,7 +33,7 @@ int dummy; struct _ohash_record { uint32_t hv; - const char *p; + const char *p; }; #define DELETED ((const char *)h) @@ -27,26 +42,11 @@ struct _ohash_record { /* Don't bother changing the hash table if the change is small enough. */ #define MINSIZE (1UL << 4) #define MINDELETED 4 -/* $OpenBSD: ohash_create_entry.c,v 1.2 2004/06/22 20:00:16 espie Exp $ */ -/* ex:ts=8 sw=4: - */ -/* Copyright (c) 1999, 2004 Marc Espie - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ +static void ohash_resize(struct ohash *); + -/* This handles the common case of variable length keys, where the +/* This handles the common case of variable length keys, where the * key is stored at the end of the record. */ void * @@ -58,15 +58,15 @@ ohash_create_entry(struct ohash_info *i, *end = start + strlen(start); p = (i->alloc)(i->key_offset + (*end - start) + 1, i->data); if (p) { - memcpy(p+i->key_offset, start, *end-start); - p[i->key_offset + (*end - start)] = '\0'; + memcpy(p+i->key_offset, start, *end-start); + p[i->key_offset + (*end - start)] = '\0'; } return (void *)p; } /* hash_delete only frees the hash structure. Use hash_first/hash_next * to free entries as well. */ -void +void ohash_delete(struct ohash *h) { (h->info.hfree)(h->t, sizeof(struct _ohash_record) * h->size, @@ -76,9 +76,7 @@ ohash_delete(struct ohash *h) #endif } -static void ohash_resize(struct ohash *); - -static void +static void ohash_resize(struct ohash *h) { struct _ohash_record *n; @@ -109,7 +107,7 @@ ohash_resize(struct ohash *h) i += incr; if (i >= ns) i -= ns; - } + } n[i].hv = h->t[j].hv; n[i].p = h->t[j].p; } @@ -125,7 +123,7 @@ ohash_resize(struct ohash *h) void * ohash_remove(struct ohash *h, unsigned int i) { - void *result = (void *)h->t[i].p; + void *result = (void *)h->t[i].p; if (result == NULL || result == DELETED) return NULL; @@ -160,11 +158,11 @@ ohash_insert(struct ohash *h, unsigned i h->t[i].p = p; } else { h->t[i].p = p; - /* Arbitrary resize boundary. Tweak if not efficient enough. */ + /* Arbitrary resize boundary. Tweak if not efficient enough. */ if (++h->total * 4 > h->size * 3) ohash_resize(h); } - return p; + return p; } unsigned int @@ -179,17 +177,17 @@ ohash_first(struct ohash *h, unsigned in *pos = 0; return ohash_next(h, pos); } - + void * ohash_next(struct ohash *h, unsigned int *pos) { - for (; *pos < h->size; (*pos)++) - if (h->t[*pos].p != DELETED && h->t[*pos].p != NULL) + for (; *pos < h->size; (*pos)++) + if (h->t[*pos].p != DELETED && h->t[*pos].p != NULL) return (void *)h->t[(*pos)++].p; return NULL; } -void +void ohash_init(struct ohash *h, unsigned int size, struct ohash_info *info) { h->size = 1UL << size; @@ -227,12 +225,12 @@ ohash_interval(const char *s, const char } unsigned int -ohash_lookup_interval(struct ohash *h, const char *start, const char *end, +ohash_lookup_interval(struct ohash *h, const char *start, const char *end, uint32_t hv) { - unsigned int i, incr; + unsigned int i, incr; unsigned int empty; - + #ifdef STATS_HASH STAT_HASH_LOOKUP++; #endif @@ -246,11 +244,11 @@ ohash_lookup_interval(struct ohash *h, c if (h->t[i].p == DELETED) { if (empty == NONE) empty = i; - } else if (h->t[i].hv == hv && - strncmp(h->t[i].p+h->info.key_offset, start, - end - start) == 0 && + } else if (h->t[i].hv == hv && + strncmp(h->t[i].p+h->info.key_offset, start, + end - start) == 0 && (h->t[i].p+h->info.key_offset)[end-start] == '\0') { - if (empty != NONE) { + if (empty != NONE) { h->t[empty].hv = hv; h->t[empty].p = h->t[i].p; h->t[i].p = DELETED; @@ -263,12 +261,12 @@ ohash_lookup_interval(struct ohash *h, c } } i += incr; - if (i >= h->size) + if (i >= h->size) i -= h->size; } /* Found an empty position. */ - if (empty != NONE) + if (empty != NONE) i = empty; h->t[i].hv = hv; return i; @@ -279,7 +277,7 @@ ohash_lookup_memory(struct ohash *h, con { unsigned int i, incr; unsigned int empty; - + #ifdef STATS_HASH STAT_HASH_LOOKUP++; #endif @@ -293,9 +291,9 @@ ohash_lookup_memory(struct ohash *h, con if (h->t[i].p == DELETED) { if (empty == NONE) empty = i; - } else if (h->t[i].hv == hv && + } else if (h->t[i].hv == hv && memcmp(h->t[i].p+h->info.key_offset, k, size) == 0) { - if (empty != NONE) { + if (empty != NONE) { h->t[empty].hv = hv; h->t[empty].p = h->t[i].p; h->t[i].p = DELETED; @@ -307,12 +305,12 @@ ohash_lookup_memory(struct ohash *h, con } return i; } i += incr; - if (i >= h->size) + if (i >= h->size) i -= h->size; } /* Found an empty position. */ - if (empty != NONE) + if (empty != NONE) i = empty; h->t[i].hv = hv; return i; -- To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv