mirror of https://github.com/nothings/stb.git
Remove unused variables and ambiguous dangling else
This commit is contained in:
parent
f298f7dabe
commit
83c5588584
34
stb.h
34
stb.h
|
@ -1244,7 +1244,7 @@ void stb_newell_normal(float *normal, int num_vert, float **vert, int normalize)
|
|||
|
||||
int stb_box_face_vertex_axis_side(int face_number, int vertex_number, int axis)
|
||||
{
|
||||
static box_vertices[6][4][3] =
|
||||
static int box_vertices[6][4][3] =
|
||||
{
|
||||
{ { 1,1,1 }, { 1,0,1 }, { 1,0,0 }, { 1,1,0 } },
|
||||
{ { 0,0,0 }, { 0,0,1 }, { 0,1,1 }, { 0,1,0 } },
|
||||
|
@ -2139,7 +2139,7 @@ void stb_replaceinplace(char *src, char *find, char *replace)
|
|||
{
|
||||
size_t len_find = strlen(find);
|
||||
size_t len_replace = strlen(replace);
|
||||
int count = 0, delta;
|
||||
int delta;
|
||||
|
||||
char *s,*p,*q;
|
||||
|
||||
|
@ -3875,15 +3875,17 @@ static int STB_(N,addset)(TYPE *a, KEY k, VALUE v, \
|
|||
unsigned int h = STB_(N, hash)(k); \
|
||||
unsigned int n = h & a->mask; \
|
||||
int b = -1; \
|
||||
if (CCOMPARE(k,EMPTY)) \
|
||||
if (CCOMPARE(k,EMPTY)) { \
|
||||
if (a->has_empty ? allow_old : allow_new) { \
|
||||
n=a->has_empty; a->ev = v; a->has_empty = 1; return !n; \
|
||||
} else return 0; \
|
||||
if (CCOMPARE(k,DEL)) \
|
||||
} \
|
||||
if (CCOMPARE(k,DEL)) { \
|
||||
if (a->has_del ? allow_old : allow_new) { \
|
||||
n=a->has_del; a->dv = v; a->has_del = 1; return !n; \
|
||||
} else return 0; \
|
||||
if (!CCOMPARE(a->table[n].k, EMPTY)) { \
|
||||
} \
|
||||
if (!CCOMPARE(a->table[n].k, EMPTY)) { \
|
||||
unsigned int s; \
|
||||
if (CCOMPARE(a->table[n].k, DEL)) \
|
||||
b = n; \
|
||||
|
@ -4036,11 +4038,12 @@ void stb_ptrmap_delete(stb_ptrmap *e, void (*free_func)(void *))
|
|||
int i;
|
||||
if (free_func)
|
||||
for (i=0; i < e->limit; ++i)
|
||||
if (e->table[i].k != STB_EMPTY && e->table[i].k != STB_EDEL)
|
||||
if (e->table[i].k != STB_EMPTY && e->table[i].k != STB_EDEL) {
|
||||
if (free_func == free)
|
||||
free(e->table[i].v); // allow STB_MALLOC_WRAPPER to operate
|
||||
else
|
||||
free_func(e->table[i].v);
|
||||
}
|
||||
stb_ptrmap_destroy(e);
|
||||
}
|
||||
|
||||
|
@ -5341,7 +5344,10 @@ FILE * stb_fopen(char *filename, char *mode)
|
|||
FILE *f;
|
||||
char name_full[4096];
|
||||
char temp_full[sizeof(name_full) + 12];
|
||||
int j,p;
|
||||
int p;
|
||||
#ifdef _MSC_VER
|
||||
int j;
|
||||
#endif
|
||||
if (mode[0] != 'w' && !strchr(mode, '+'))
|
||||
return stb__fopen(filename, mode);
|
||||
|
||||
|
@ -5904,7 +5910,6 @@ char **stb_readdir_subdirs_mask(char *dir, char *wild) { return readdir_raw(dir,
|
|||
int stb__rec_max=0x7fffffff;
|
||||
static char **stb_readdir_rec(char **sofar, char *dir, char *filespec)
|
||||
{
|
||||
int n = strcmp(dir, ".") ? strlen(dir)+1 : 0;
|
||||
char **files;
|
||||
char ** dirs;
|
||||
char **p;
|
||||
|
@ -6491,7 +6496,7 @@ STB_EXTERN void stb_cfg_set_directory(char *dir)
|
|||
|
||||
STB_EXTERN stb_cfg * stb_cfg_open(char *config, char *mode)
|
||||
{
|
||||
unsigned int len;
|
||||
size_t len;
|
||||
stb_cfg *z;
|
||||
char file[512];
|
||||
if (mode[0] != 'r' && mode[0] != 'w') return NULL;
|
||||
|
@ -7114,7 +7119,7 @@ static void stb__grow_alloc(void)
|
|||
static void stb__add_alloc(void *p, int sz, char *file, int line)
|
||||
{
|
||||
stb_uint32 h;
|
||||
int n, f=-1;
|
||||
int n;
|
||||
if (stb__alloc_count >= stb__alloc_limit)
|
||||
stb__grow_alloc();
|
||||
h = stb_hashptr(p);
|
||||
|
@ -9213,7 +9218,6 @@ static void stb__lex_reset(stb_matcher *matcher)
|
|||
|
||||
stb_matcher *stb_regex_matcher(char *regex)
|
||||
{
|
||||
void *c = stb__arr_context;
|
||||
char *z;
|
||||
stb_uint16 end;
|
||||
stb_matcher *matcher = stb__alloc_matcher();
|
||||
|
@ -10357,9 +10361,9 @@ stb_uint stb_compress(stb_uchar *out, stb_uchar *input, stb_uint length)
|
|||
|
||||
int stb_compress_tofile(char *filename, char *input, unsigned int length)
|
||||
{
|
||||
int maxlen = length + 512 + (length >> 2); // total guess
|
||||
char *buffer = (char *) malloc(maxlen);
|
||||
int blen = stb_compress((stb_uchar*)buffer, (stb_uchar*)input, length);
|
||||
//int maxlen = length + 512 + (length >> 2); // total guess
|
||||
//char *buffer = (char *) malloc(maxlen);
|
||||
//int blen = stb_compress((stb_uchar*)buffer, (stb_uchar*)input, length);
|
||||
|
||||
stb__out = NULL;
|
||||
stb__outfile = fopen(filename, "wb");
|
||||
|
@ -10377,7 +10381,7 @@ int stb_compress_tofile(char *filename, char *input, unsigned int length)
|
|||
|
||||
int stb_compress_intofile(FILE *f, char *input, unsigned int length)
|
||||
{
|
||||
int maxlen = length + 512 + (length >> 2); // total guess
|
||||
//int maxlen = length + 512 + (length >> 2); // total guess
|
||||
//char *buffer = (char*)malloc(maxlen);
|
||||
//int blen = stb_compress((stb_uchar*)buffer, (stb_uchar*)input, length);
|
||||
|
||||
|
|
Loading…
Reference in New Issue