Replace assert(0) with abort() or cpu_abort()

[qemu.git] / block / vvfat.c

diff --git a/block/vvfat.c b/block/vvfat.c
index d2787b9e761e6720ae1925aa5a3d4ef585365916..36f6ab4441d70e5d78043b7822e16255b7a13887 100644 (file)
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -883,7 +883,7 @@ static int init_directories(BDRVVVFATState* s,
     mapping->dir_index = 0;
     mapping->info.dir.parent_mapping_index = -1;
     mapping->first_mapping_index = -1;
-    mapping->path = strdup(dirname);
+    mapping->path = qemu_strdup(dirname);
     i = strlen(mapping->path);
     if (i > 0 && mapping->path[i - 1] == '/')
        mapping->path[i - 1] = '\0';
@@ -1633,12 +1633,12 @@ static uint32_t get_cluster_count_for_direntry(BDRVVVFATState* s,
 
            /* rename */
            if (strcmp(basename, basename2))
-               schedule_rename(s, cluster_num, strdup(path));
+               schedule_rename(s, cluster_num, qemu_strdup(path));
        } else if (is_file(direntry))
            /* new file */
-           schedule_new_file(s, strdup(path), cluster_num);
+           schedule_new_file(s, qemu_strdup(path), cluster_num);
        else {
-           assert(0);
+            abort();
            return 0;
        }
     }
@@ -1659,7 +1659,7 @@ static uint32_t get_cluster_count_for_direntry(BDRVVVFATState* s,
                    if (offset != mapping->info.file.offset + s->cluster_size
                            * (cluster_num - mapping->begin)) {
                        /* offset of this cluster in file chain has changed */
-                       assert(0);
+                        abort();
                        copy_it = 1;
                    } else if (offset == 0) {
                        const char* basename = get_basename(mapping->path);
@@ -1671,7 +1671,7 @@ static uint32_t get_cluster_count_for_direntry(BDRVVVFATState* s,
 
                    if (mapping->first_mapping_index != first_mapping_index
                            && mapping->info.file.offset > 0) {
-                       assert(0);
+                        abort();
                        copy_it = 1;
                    }
 
@@ -1753,10 +1753,10 @@ static int check_directory_consistency(BDRVVVFATState *s,
        mapping->mode &= ~MODE_DELETED;
 
        if (strcmp(basename, basename2))
-           schedule_rename(s, cluster_num, strdup(path));
+           schedule_rename(s, cluster_num, qemu_strdup(path));
     } else
        /* new directory */
-       schedule_mkdir(s, cluster_num, strdup(path));
+       schedule_mkdir(s, cluster_num, qemu_strdup(path));
 
     lfn_init(&lfn);
     do {
@@ -1837,7 +1837,7 @@ DLOG(fprintf(stderr, "check direntry %d: \n", i); print_direntry(direntries + i)
                    goto fail;
                }
            } else
-               assert(0); /* cluster_count = 0; */
+                abort(); /* cluster_count = 0; */
 
            ret += cluster_count;
        }
@@ -2458,14 +2458,17 @@ static int handle_commits(BDRVVVFATState* s)
        commit_t* commit = array_get(&(s->commits), i);
        switch(commit->action) {
        case ACTION_RENAME: case ACTION_MKDIR:
-           assert(0);
+            abort();
            fail = -2;
            break;
        case ACTION_WRITEOUT: {
+#ifndef NDEBUG
+            /* these variables are only used by assert() below */
            direntry_t* entry = array_get(&(s->directory),
                    commit->param.writeout.dir_index);
            uint32_t begin = begin_of_direntry(entry);
            mapping_t* mapping = find_mapping_for_cluster(s, begin);
+#endif
 
            assert(mapping);
            assert(mapping->begin == begin);
@@ -2516,7 +2519,7 @@ static int handle_commits(BDRVVVFATState* s)
            break;
        }
        default:
-           assert(0);
+            abort();
        }
     }
     if (i > 0 && array_remove_slice(&(s->commits), 0, i))
@@ -2604,7 +2607,7 @@ static int do_commit(BDRVVVFATState* s)
     ret = handle_renames_and_mkdirs(s);
     if (ret) {
        fprintf(stderr, "Error handling renames (%d)\n", ret);
-       assert(0);
+        abort();
        return ret;
     }
 
@@ -2615,21 +2618,21 @@ static int do_commit(BDRVVVFATState* s)
     ret = commit_direntries(s, 0, -1);
     if (ret) {
        fprintf(stderr, "Fatal: error while committing (%d)\n", ret);
-       assert(0);
+        abort();
        return ret;
     }
 
     ret = handle_commits(s);
     if (ret) {
        fprintf(stderr, "Error handling commits (%d)\n", ret);
-       assert(0);
+        abort();
        return ret;
     }
 
     ret = handle_deletes(s);
     if (ret) {
        fprintf(stderr, "Error deleting\n");
-        assert(0);
+        abort();
        return ret;
     }