commit a8995adc2b363811482c38009f64992b322efaad
author Dan Albert <danalbert@google.com> Mon Sep 08 18:34:29 2014 -0700
committer Dan Albert <danalbert@google.com> Mon Sep 08 18:34:29 2014 -0700
tree 37cb7d31ea9614a7f4c200c14bc36125d789f083
parent f4eaaadb8cb0e2ff8d1704827883b5a62173311d

Don't check for null references.

The address of a reference will never be null in well formed C++ code.
The function returning the value being checked simply returns a
dereferenced pointer (which is just going to segfault if it is null!).

Change-Id: I3a4eb6adfc003c63ebf21b81d46088d52154d99d

tools/aapt/Command.cpp

diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp
index f7de558..93dc5c9 100644
--- a/tools/aapt/Command.cpp
+++ b/tools/aapt/Command.cpp
@@ -197,14 +197,10 @@
         }
 
         const ResTable& res = assets.getResources(false);
-        if (&res == NULL) {
-            printf("\nNo resource table found.\n");
-        } else {
 #ifndef HAVE_ANDROID_OS
-            printf("\nResource table:\n");
-            res.print(false);
+        printf("\nResource table:\n");
+        res.print(false);
 #endif
-        }
 
         Asset* manifestAsset = assets.openNonAsset("AndroidManifest.xml",
                                                    Asset::ACCESS_BUFFER);
@@ -531,11 +527,6 @@
     assets.setConfiguration(config);
 
     const ResTable& res = assets.getResources(false);
-    if (&res == NULL) {
-        fprintf(stderr, "ERROR: dump failed because no resource table was found\n");
-        goto bail;
-    }
-
     if (strcmp("resources", option) == 0) {
 #ifndef HAVE_ANDROID_OS
         res.print(bundle->getValues());