From 265442045f192562c335cecb745ee4f6f585a797 Mon Sep 17 00:00:00 2001
From: jsalmon3 <>
Date: Sat, 15 May 2004 12:48:51 +0000
Subject: [PATCH] Cleanup
---
src/stratagus/util.cpp | 369 ++++++++++++++++++++---------------------
1 file changed, 183 insertions(+), 186 deletions(-)
diff --git a/src/stratagus/util.cpp b/src/stratagus/util.cpp
index f85274ef4..0a72afd7c 100644
--- a/src/stratagus/util.cpp
+++ b/src/stratagus/util.cpp
@@ -1,5 +1,7 @@
#include <stdlib.h>
#include <string.h>
+
+#include "stratagus.h"
#include "util.h"
/*
@@ -44,255 +46,250 @@
struct symbol
{
- struct symbol *left;
- struct symbol *right;
+ struct symbol* left;
+ struct symbol* right;
// contains user struct and name
- Uint8 misc[2];
+ Uint8 misc[2];
};
-
-static inline Uint32 hash(const Uint8 *str)
+static inline Uint32 hash(const Uint8* str)
{
- Uint32 h = 0;
+ Uint32 h;
- while (*str)
- h = (h << 4) ^ (h >> 28) ^ *str++;
-
- return h ? h : 1;
-}
-
-
-/*
- Find a symbol. Return 0 if not found.
-*/
-
-const void *_hash_find(const Uint8 *id, const void *tab, int size, int usize)
-{
- const struct symbol *s;
- Uint32 h;
- int i;
-
- h = hash(id);
- s = ((const struct symbol **)tab)[h % size];
-
- while (s)
- {
- i = (Uint8)h - s->misc[usize];
- if (i == 0)
- {
- i = strcmp(id, s->misc + usize + 1);
- if (i == 0)
- return s->misc;
+ h = 0;
+ while (*str) {
+ h = (h << 4) ^ (h >> 28) ^ *str++;
}
- s = i < 0 ? s->left : s->right;
- }
- return 0;
+
+ return h ? h : 1;
}
-
-
-/*
- Get a symbol. Create if not found.
+/**
+** Find a symbol. Return 0 if not found.
*/
-
-void *_hash_get(const Uint8 *id, void *tab, int size, int usize)
+const void* _hash_find(const Uint8* id, const void* tab, int size, int usize)
{
- struct symbol *s;
- struct symbol **ss;
- Uint32 h;
- int i;
-
- h = hash(id);
- ss = &((struct symbol **)tab)[h % size];
+ const struct symbol* s;
+ Uint32 h;
+ int i;
- while ( (s = *ss) )
- {
- i = (Uint8)h - s->misc[usize];
- if (i == 0)
- {
- i = strcmp(id, s->misc + usize + 1);
- if (i == 0)
- return s->misc;
- }
- ss = i < 0 ? &s->left : &s->right;
- }
+ h = hash(id);
+ s = ((const struct symbol**)tab)[h % size];
- *ss = s = malloc(sizeof(*s) + usize + strlen(id));
-
- s->left = 0;
- s->right = 0;
- memset(s->misc, 0, usize);
- s->misc[usize] = (Uint8)h;
- strcpy(s->misc + usize + 1, id);
-
- return s->misc;
-}
-
-/*
- Delete a symbol.
-*/
-void _hash_del(const Uint8 *id, void *tab, int size, int usize)
-{
- struct symbol *s;
- struct symbol **ss;
- Uint32 h;
- int i;
-
- h = hash(id);
- ss = &((struct symbol **)tab)[h % size];
-
- while ( (s = *ss) )
- {
- i = (Uint8)h - s->misc[usize];
- if (i == 0)
- {
- i = strcmp(id, s->misc + usize + 1);
- if (i == 0)
- {
- /* found, now remove it */
- if (s->left == 0)
- *ss = s->right;
- else if (s->right == 0)
- *ss = s->left;
- else
- {
- struct symbol *t, **tt;
-
- for (tt = &s->right; (t = *tt)->left; tt = &t->left)
- ;
- *tt = t->right;
- t->left = s->left;
- t->right = s->right;
- *ss = t;
+ while (s) {
+ i = (Uint8)h - s->misc[usize];
+ if (i == 0) {
+ i = strcmp(id, s->misc + usize + 1);
+ if (i == 0) {
+ return s->misc;
+ }
}
- free(s);
- return;
- }
+ s = i < 0 ? s->left : s->right;
}
- ss = i < 0 ? &s->left : &s->right;
- }
+ return 0;
}
-
-
-static void _stat(int depth, struct symbol *s, struct hash_st *st)
+/**
+** Get a symbol. Create if not found.
+*/
+void* _hash_get(const Uint8* id, void* tab, int size, int usize)
{
- while (s)
- {
- if (st->maxdepth < depth)
- st->maxdepth = depth;
- st->nelem++;
- st->middepth += depth;
- depth++;
- _stat(depth, s->left, st);
- #if 0
- printf("<%s>\t", s->misc+5);
- if (s->left) printf("<%s>\t", s->left->misc+5); else printf(".\t");
- if (s->right) printf("<%s>\n", s->right->misc+5); else printf(".\n");
- #endif
- s = s->right;
- }
+ struct symbol* s;
+ struct symbol** ss;
+ Uint32 h;
+ int i;
+
+ h = hash(id);
+ ss = &((struct symbol**)tab)[h % size];
+
+ while ((s = *ss)) {
+ i = (Uint8)h - s->misc[usize];
+ if (i == 0) {
+ i = strcmp(id, s->misc + usize + 1);
+ if (i == 0) {
+ return s->misc;
+ }
+ }
+ ss = i < 0 ? &s->left : &s->right;
+ }
+
+ *ss = s = malloc(sizeof(*s) + usize + strlen(id));
+
+ s->left = 0;
+ s->right = 0;
+ memset(s->misc, 0, usize);
+ s->misc[usize] = (Uint8)h;
+ strcpy(s->misc + usize + 1, id);
+
+ return s->misc;
}
-
-
-void _hash_stat(void *tab, int size, struct hash_st *st)
+/**
+** Delete a symbol.
+*/
+void _hash_del(const Uint8* id, void* tab, int size, int usize)
{
- struct symbol **s;
+ struct symbol* s;
+ struct symbol** ss;
+ Uint32 h;
+ int i;
- s = (struct symbol **)tab;
+ h = hash(id);
+ ss = &((struct symbol**)tab)[h % size];
- st->nelem = 0;
- st->maxdepth = 0;
- st->middepth = 0;
- st->hashsize = size;
+ while ((s = *ss)) {
+ i = (Uint8)h - s->misc[usize];
+ if (i == 0) {
+ i = strcmp(id, s->misc + usize + 1);
+ if (i == 0) {
+ /* found, now remove it */
+ if (s->left == 0) {
+ *ss = s->right;
+ } else if (s->right == 0) {
+ *ss = s->left;
+ } else {
+ struct symbol* t;
+ struct symbol** tt;
- while (size--)
- _stat(1, *s++, st);
+ for (tt = &s->right; (t = *tt)->left; tt = &t->left) {
+ }
+ *tt = t->right;
+ t->left = s->left;
+ t->right = s->right;
+ *ss = t;
+ }
+ free(s);
+ return;
+ }
+ }
+ ss = i < 0 ? &s->left : &s->right;
+ }
+}
- if (st->nelem)
- st->middepth = (st->middepth * 1000) / st->nelem;
+static void _stat(int depth, struct symbol* s, struct hash_st* st)
+{
+ while (s) {
+ if (st->maxdepth < depth) {
+ st->maxdepth = depth;
+ }
+ st->nelem++;
+ st->middepth += depth;
+ depth++;
+ _stat(depth, s->left, st);
+#if 0
+ printf("<%s>\t", s->misc+5);
+ if (s->left) {
+ printf("<%s>\t", s->left->misc+5);
+ } else {
+ printf(".\t");
+ }
+ if (s->right) {
+ printf("<%s>\n", s->right->misc+5);
+ } else {
+ printf(".\n");
+ }
+#endif
+ s = s->right;
+ }
+}
+
+void _hash_stat(void* tab, int size, struct hash_st* st)
+{
+ struct symbol** s;
+
+ s = (struct symbol**)tab;
+
+ st->nelem = 0;
+ st->maxdepth = 0;
+ st->middepth = 0;
+ st->hashsize = size;
+
+ while (size--) {
+ _stat(1, *s++, st);
+ }
+
+ if (st->nelem) {
+ st->middepth = (st->middepth * 1000) / st->nelem;
+ }
}
-/*
- * Standard implementation of getopt(3).
- *
- * One extension: If the first character of the optionsstring is a ':'
- * the error return for 'argument required' is a ':' not a '?'.
- * This makes it easier to differentiate between an 'illegal option' and
- * an 'argument required' error.
- */
-#ifdef _MSC_VER
+/**
+** Standard implementation of getopt(3).
+**
+** One extension: If the first character of the optionsstring is a ':'
+** the error return for 'argument required' is a ':' not a '?'.
+** This makes it easier to differentiate between an 'illegal option' and
+** an 'argument required' error.
+*/
-#include <stdio.h>
+#ifdef _MSC_VER
+
+#include <io.h>
#include <string.h>
int opterr = 1;
int optind = 1;
int optopt;
-char *optarg;
+char* optarg;
-
-
-static void getopt_err(char *argv0, char *str, char opt)
+static void getopt_err(char* argv0, char* str, char opt)
{
- if (opterr) {
+ if (opterr) {
char errbuf[2];
- char *x;
+ char* x;
errbuf[0] = opt;
errbuf[1] = '\n';
while ((x = strchr(argv0, '/'))) {
- argv0 = x + 1;
+ argv0 = x + 1;
}
write(2, argv0, strlen(argv0));
write(2, str, strlen(str));
write(2, errbuf, 2);
- }
+ }
}
-
-
-int getopt(int argc, char** argv, char *opts)
+int getopt(int argc, char** argv, char* opts)
{
- static int sp = 1;
- register int c;
- register char *cp;
+ static int sp = 1;
+ register int c;
+ register char *cp;
- optarg = NULL;
+ optarg = NULL;
- if (sp == 1) {
+ if (sp == 1) {
if (optind >= argc || argv[optind][0] != '-' || argv[optind][1] == '\0') {
- return EOF;
- } else if (strcmp(argv[optind], "--") == NULL) {
- optind++;
- return EOF;
+ return EOF;
+ } else if (!strcmp(argv[optind], "--")) {
+ optind++;
+ return EOF;
}
- }
- optopt = c = argv[optind][sp];
- if (c == ':' || (cp = strchr(opts, c)) == NULL) {
+ }
+ optopt = c = argv[optind][sp];
+ if (c == ':' || (cp = strchr(opts, c)) == NULL) {
getopt_err(argv[0], ": illegal option -", (char)c);
cp = "xx"; /* make the next if false */
c = '?';
- }
- if (*++cp == ':') {
+ }
+ if (*++cp == ':') {
if (argv[optind][++sp] != '\0') {
- optarg = &argv[optind++][sp];
+ optarg = &argv[optind++][sp];
} else if (++optind < argc) {
- optarg = argv[optind++];
+ optarg = argv[optind++];
} else {
- getopt_err(argv[0], ": option requires an argument -", (char)c);
- c = (*opts == ':') ? ':' : '?';
+ getopt_err(argv[0], ": option requires an argument -", (char)c);
+ c = (*opts == ':') ? ':' : '?';
}
sp = 1;
- } else if (argv[optind][++sp] == '\0') {
+ } else if (argv[optind][++sp] == '\0') {
optind++;
sp = 1;
- }
- return c;
+ }
+ return c;
}
+
#endif /* _MSVC */