Revision 511d2b14 block-vvfat.c

b/block-vvfat.c
78 78

  
79 79
static inline void array_init(array_t* array,unsigned int item_size)
80 80
{
81
    array->pointer=0;
81
    array->pointer = NULL;
82 82
    array->size=0;
83 83
    array->next=0;
84 84
    array->item_size=item_size;
......
129 129
	int increment=count*array->item_size;
130 130
	array->pointer=qemu_realloc(array->pointer,array->size+increment);
131 131
	if(!array->pointer)
132
	    return 0;
132
            return NULL;
133 133
	array->size+=increment;
134 134
    }
135 135
    memmove(array->pointer+(index+count)*array->item_size,
......
604 604
	unsigned int directory_start, const char* filename, int is_dot)
605 605
{
606 606
    int i,j,long_index=s->directory.next;
607
    direntry_t* entry=0;
608
    direntry_t* entry_long=0;
607
    direntry_t* entry = NULL;
608
    direntry_t* entry_long = NULL;
609 609

  
610 610
    if(is_dot) {
611 611
	entry=array_get_next(&(s->directory));
......
696 696
    int first_cluster = mapping->begin;
697 697
    int parent_index = mapping->info.dir.parent_mapping_index;
698 698
    mapping_t* parent_mapping = (mapping_t*)
699
	(parent_index >= 0 ? array_get(&(s->mapping), parent_index) : 0);
699
        (parent_index >= 0 ? array_get(&(s->mapping), parent_index) : NULL);
700 700
    int first_cluster_of_parent = parent_mapping ? parent_mapping->begin : -1;
701 701

  
702 702
    DIR* dir=opendir(dirname);
......
1125 1125
    int index=find_mapping_for_cluster_aux(s,cluster_num,0,s->mapping.next);
1126 1126
    mapping_t* mapping;
1127 1127
    if(index>=s->mapping.next)
1128
	return 0;
1128
        return NULL;
1129 1129
    mapping=array_get(&(s->mapping),index);
1130 1130
    if(mapping->begin>cluster_num)
1131
	return 0;
1131
        return NULL;
1132 1132
    assert(mapping->begin<=cluster_num && mapping->end>cluster_num);
1133 1133
    return mapping;
1134 1134
}

Also available in: Unified diff