commit 18fe86e8245878f3b7a2813bd59b8cfcf636e15c
author David 'Digit' Turner <digit@android.com> Tue Oct 19 08:07:11 2010 +0200
committer David 'Digit' Turner <digit@android.com> Tue Oct 19 08:33:48 2010 +0200
tree 16ecfe8a8665aec212abdd3f2fcd1e122635358b
parent 6b512811e01d7c81348bfa9c29c21f788ccc0a8e

emulator-ui: Remove dependencies from qemu sources.

This change removes some QEMU-specifics that crept into the UI code.

Change-Id: Ib1974dc64e54a35dc0cd01aec1eb547a9263a0c8

android/utils/dirscanner.c

diff --git a/android/utils/dirscanner.c b/android/utils/dirscanner.c
index fc63ef0..9c6a39c 100644
--- a/android/utils/dirscanner.c
+++ b/android/utils/dirscanner.c
@@ -11,7 +11,8 @@
 */
 #include "android/utils/dirscanner.h"
 #include "android/utils/bufprint.h"
-#include "qemu-common.h"
+#include "android/utils/system.h"
+#include "android/utils/path.h"
 #include <stddef.h>
 
 #define  DIRSCANNER_BASE     \
@@ -149,7 +150,7 @@
 DirScanner*
 dirScanner_new ( const char*  rootPath )
 {
-    DirScanner*  s   = qemu_mallocz(sizeof *s);
+    DirScanner*  s   = android_alloc0(sizeof *s);
     char*        p   = s->root;
     char*        end = p + sizeof s->root;
 
@@ -177,7 +178,7 @@
         return;
 
     _dirScanner_done(s);
-    qemu_free(s);
+    AFREE(s);
 }