AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert prev check-in

Browse Source
This commit is contained in:
Brian Paul
2006-11-16 23:34:02 +00:00
parent 523f5cfeb5
commit 7984c70070
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/shader/slang/slang_utility.c
+8 -13
View File
@@ -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)
src/mesa/shader/slang/slang_utility.h
+1 -1
View File
@@ -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