summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2006-11-16 23:34:02 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2006-11-16 23:34:02 +0000
commit7984c70070ea3fee1600095b1f32b0f8adf2ad31 (patch)
treed85f7629d8f53e470620983e3d92244b15724d34
parent523f5cfeb537e52baa892148b7b050fb076ef1b0 (diff)
revert prev check-in
-rw-r--r--src/mesa/shader/slang/slang_utility.c21
-rw-r--r--src/mesa/shader/slang/slang_utility.h2
2 files changed, 9 insertions, 14 deletions
diff --git a/src/mesa/shader/slang/slang_utility.c b/src/mesa/shader/slang/slang_utility.c
index 28837248df..54fcc8a238 100644
--- a/src/mesa/shader/slang/slang_utility.c
+++ b/src/mesa/shader/slang/slang_utility.c
@@ -160,16 +160,11 @@ void slang_atom_pool_destruct (slang_atom_pool *pool)
}
}
-/**
- * Search atom pool for atom with the given name.
- * If name is not found, create new atom (but don't insert into pool?)
- */
-slang_atom slang_atom_pool_atom (const slang_atom_pool *pool, const char *id)
+slang_atom slang_atom_pool_atom (slang_atom_pool *pool, const char *id)
{
GLuint hash;
const char *p = id;
- slang_atom_entry * const * entry;
- slang_atom_entry **newEntry = NULL;
+ slang_atom_entry **entry;
hash = 0;
while (*p != '\0')
@@ -192,15 +187,15 @@ slang_atom slang_atom_pool_atom (const slang_atom_pool *pool, const char *id)
entry = &(**entry).next;
}
- *newEntry = (slang_atom_entry *) slang_alloc_malloc (sizeof (slang_atom_entry));
- if (*newEntry == NULL)
+ *entry = (slang_atom_entry *) slang_alloc_malloc (sizeof (slang_atom_entry));
+ if (*entry == NULL)
return SLANG_ATOM_NULL;
- (**newEntry).next = NULL;
- (**newEntry).id = slang_string_duplicate (id);
- if ((**newEntry).id == NULL)
+ (**entry).next = NULL;
+ (**entry).id = slang_string_duplicate (id);
+ if ((**entry).id == NULL)
return SLANG_ATOM_NULL;
- return (slang_atom) (**newEntry).id;
+ return (slang_atom) (**entry).id;
}
const char *slang_atom_pool_id (slang_atom_pool *pool, slang_atom atom)
diff --git a/src/mesa/shader/slang/slang_utility.h b/src/mesa/shader/slang/slang_utility.h
index 3487e4ec51..565de4e4b0 100644
--- a/src/mesa/shader/slang/slang_utility.h
+++ b/src/mesa/shader/slang/slang_utility.h
@@ -99,7 +99,7 @@ typedef struct slang_atom_pool_
GLvoid slang_atom_pool_construct (slang_atom_pool *);
GLvoid slang_atom_pool_destruct (slang_atom_pool *);
-slang_atom slang_atom_pool_atom (const slang_atom_pool *, const char *);
+slang_atom slang_atom_pool_atom (slang_atom_pool *, const char *);
const char *slang_atom_pool_id (slang_atom_pool *, slang_atom);
#ifdef __cplusplus