2
0
Эх сурвалжийг харах

Drop superfluous conditionals around g_free()

There is no need to guard g_free(P) with if (P): g_free(NULL) is safe.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220923090428.93529-1-armbru@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Markus Armbruster 2 жил өмнө
parent
commit
76eb88b12b

+ 2 - 4
replay/replay.c

@@ -366,10 +366,8 @@ void replay_finish(void)
         fclose(replay_file);
         fclose(replay_file);
         replay_file = NULL;
         replay_file = NULL;
     }
     }
-    if (replay_filename) {
-        g_free(replay_filename);
-        replay_filename = NULL;
-    }
+    g_free(replay_filename);
+    replay_filename = NULL;
 
 
     g_free(replay_snapshot);
     g_free(replay_snapshot);
     replay_snapshot = NULL;
     replay_snapshot = NULL;

+ 4 - 8
target/i386/kvm/kvm.c

@@ -2176,15 +2176,11 @@ int kvm_arch_destroy_vcpu(CPUState *cs)
 
 
     g_free(env->xsave_buf);
     g_free(env->xsave_buf);
 
 
-    if (cpu->kvm_msr_buf) {
-        g_free(cpu->kvm_msr_buf);
-        cpu->kvm_msr_buf = NULL;
-    }
+    g_free(cpu->kvm_msr_buf);
+    cpu->kvm_msr_buf = NULL;
 
 
-    if (env->nested_state) {
-        g_free(env->nested_state);
-        env->nested_state = NULL;
-    }
+    g_free(env->nested_state);
+    env->nested_state = NULL;
 
 
     qemu_del_vm_change_state_handler(cpu->vmsentry);
     qemu_del_vm_change_state_handler(cpu->vmsentry);
 
 

+ 6 - 8
target/i386/whpx/whpx-all.c

@@ -1225,14 +1225,12 @@ static void whpx_translate_cpu_breakpoints(
         }
         }
     }
     }
 
 
-    if (breakpoints->breakpoints) {
-        /*
-         * Free the previous breakpoint list. This can be optimized by keeping
-         * it as shadow buffer for the next computation instead of freeing
-         * it immediately.
-         */
-        g_free(breakpoints->breakpoints);
-    }
+    /*
+     * Free the previous breakpoint list. This can be optimized by keeping
+     * it as shadow buffer for the next computation instead of freeing
+     * it immediately.
+     */
+    g_free(breakpoints->breakpoints);
 
 
     breakpoints->breakpoints = new_breakpoints;
     breakpoints->breakpoints = new_breakpoints;
 }
 }