projects
/
projects
/
chimara
/
chimara.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Incorporate fix for NULL memory streams
[projects/chimara/chimara.git]
/
libchimara
/
gi_blorb.c
diff --git
a/libchimara/gi_blorb.c
b/libchimara/gi_blorb.c
index 9f4c031b709e642a2e2d9a2f0ae3cb160f8461b8..cdee5f7b35f586f84fd0c7283f56ed46d7d2db0a 100644
(file)
--- a/
libchimara/gi_blorb.c
+++ b/
libchimara/gi_blorb.c
@@
-227,7
+227,6
@@
static giblorb_err_t giblorb_initialize_map(giblorb_map_t *map)
giblorb_err_t err;
char *ptr;
glui32 len;
giblorb_err_t err;
char *ptr;
glui32 len;
- glui32 val;
glui32 numres;
int gotindex = FALSE;
glui32 numres;
int gotindex = FALSE;
@@
-396,7
+395,6
@@
giblorb_err_t giblorb_load_chunk_by_number(giblorb_map_t *map,
case giblorb_method_Memory:
if (!chu->ptr) {
case giblorb_method_Memory:
if (!chu->ptr) {
- giblorb_err_t err;
glui32 readlen;
void *dat = giblorb_malloc(chu->len);
glui32 readlen;
void *dat = giblorb_malloc(chu->len);
@@
-515,7
+513,7
@@
static int sortsplot(giblorb_resdesc_t *v1, giblorb_resdesc_t *v2)
static void giblorb_qsort(giblorb_resdesc_t **list, int len)
{
static void giblorb_qsort(giblorb_resdesc_t **list, int len)
{
- int ix, jx, res
, val
;
+ int ix, jx, res;
giblorb_resdesc_t *tmpptr, *pivot;
if (len < 6) {
giblorb_resdesc_t *tmpptr, *pivot;
if (len < 6) {
@@
-599,5
+597,3
@@
static void giblorb_free(void *ptr)
{
g_free(ptr);
}
{
g_free(ptr);
}
-
-