commit dfacaae0efc3866b28187627cc8543d8a9008df1
author Kenny Root <kroot@google.com> Fri Dec 05 00:16:02 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Dec 05 00:16:02 2014 +0000
tree 42c929861c8f7be71723823458495e8c56c83612
parent e4472982229b62f333c3dea953531aff924b55c1
parent c18a034e1654f3c6dfbb73212630465c33f0a07e

am c18a034e: am 47c0fcd0: Merge "initialization of defined variables"

* commit 'c18a034e1654f3c6dfbb73212630465c33f0a07e':
  initialization of defined variables

hardware.c

diff --git a/hardware.c b/hardware.c
index 6713ea0..79d0a2f 100644
--- a/hardware.c
+++ b/hardware.c
@@ -67,9 +67,9 @@
         const char *path,
         const struct hw_module_t **pHmi)
 {
-    int status;
-    void *handle;
-    struct hw_module_t *hmi;
+    int status = -EINVAL;
+    void *handle = NULL;
+    struct hw_module_t *hmi = NULL;
 
     /*
      * load the symbols resolving undefined symbols before
@@ -145,11 +145,12 @@
 int hw_get_module_by_class(const char *class_id, const char *inst,
                            const struct hw_module_t **module)
 {
-    int i;
-    char prop[PATH_MAX];
-    char path[PATH_MAX];
-    char name[PATH_MAX];
-    char prop_name[PATH_MAX];
+    int i = 0;
+    char prop[PATH_MAX] = {0};
+    char path[PATH_MAX] = {0};
+    char name[PATH_MAX] = {0};
+    char prop_name[PATH_MAX] = {0};
+
 
     if (inst)
         snprintf(name, PATH_MAX, "%s.%s", class_id, inst);