commit ac6453b927ba1d83948dc25698752effd7f5ea86
author Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> Fri Sep 19 15:29:07 2014 +0200
committer Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> Fri Sep 19 15:33:57 2014 +0200
tree 226f3afbbb6648f6357f3bd80bcc959162faea89
parent 55ea79b11f9f82b2aa03f44a3429112fc5c06d07

Remove checks for conditions that can't happen

In the context of "char str[30];", str can't be NULL.
clang knows about this and throws a warning, breaking the build with
-Werror.

Change-Id: I1d0ba33e1549883c25a821d98256820186a251f1
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>

camera/QCamera2/HAL3/QCamera3Channel.cpp

diff --git a/camera/QCamera2/HAL3/QCamera3Channel.cpp b/camera/QCamera2/HAL3/QCamera3Channel.cpp
index 733237d..ee6622a 100755
--- a/camera/QCamera2/HAL3/QCamera3Channel.cpp
+++ b/camera/QCamera2/HAL3/QCamera3Channel.cpp
@@ -1475,21 +1475,17 @@
 {
     char str[30];
     snprintf(str, sizeof(str), "%f", value);
-    if(str != NULL) {
-        parseGPSCoordinate(str, latitude);
+    parseGPSCoordinate(str, latitude);
 
-        //set Latitude Ref
-        float latitudeValue = strtof(str, 0);
-        if(latitudeValue < 0.0f) {
-            latRef[0] = 'S';
-        } else {
-            latRef[0] = 'N';
-        }
-        latRef[1] = '\0';
-        return NO_ERROR;
-    }else{
-        return BAD_VALUE;
+    //set Latitude Ref
+    float latitudeValue = strtof(str, 0);
+    if(latitudeValue < 0.0f) {
+        latRef[0] = 'S';
+    } else {
+        latRef[0] = 'N';
     }
+    latRef[1] = '\0';
+    return NO_ERROR;
 }
 
 /*===========================================================================
@@ -1510,21 +1506,17 @@
 {
     char str[30];
     snprintf(str, sizeof(str), "%f", value);
-    if(str != NULL) {
-        parseGPSCoordinate(str, longitude);
+    parseGPSCoordinate(str, longitude);
 
-        //set Longitude Ref
-        float longitudeValue = strtof(str, 0);
-        if(longitudeValue < 0.0f) {
-            lonRef[0] = 'W';
-        } else {
-            lonRef[0] = 'E';
-        }
-        lonRef[1] = '\0';
-        return NO_ERROR;
-    }else{
-        return BAD_VALUE;
+    //set Longitude Ref
+    float longitudeValue = strtof(str, 0);
+    if(longitudeValue < 0.0f) {
+        lonRef[0] = 'W';
+    } else {
+        lonRef[0] = 'E';
     }
+    lonRef[1] = '\0';
+    return NO_ERROR;
 }
 
 /*===========================================================================
@@ -1545,17 +1537,13 @@
 {
     char str[30];
     snprintf(str, sizeof(str), "%f", value);
-    if(str != NULL) {
-        double value = atof(str);
-        *altRef = 0;
-        if(value < 0){
-            *altRef = 1;
-            value = -value;
-        }
-        return getRational(altitude, value*1000, 1000);
-    }else{
-        return BAD_VALUE;
+    value = atof(str);
+    *altRef = 0;
+    if(value < 0){
+        *altRef = 1;
+        value = -value;
     }
+    return getRational(altitude, value*1000, 1000);
 }
 
 /*===========================================================================
@@ -1578,20 +1566,16 @@
 {
     char str[30];
     snprintf(str, sizeof(str), "%lld", value);
-    if(str != NULL) {
-        time_t unixTime = (time_t)atol(str);
-        struct tm *UTCTimestamp = gmtime(&unixTime);
+    time_t unixTime = (time_t)atol(str);
+    struct tm *UTCTimestamp = gmtime(&unixTime);
 
-        strftime(gpsDateStamp, bufLen, "%Y:%m:%d", UTCTimestamp);
+    strftime(gpsDateStamp, bufLen, "%Y:%m:%d", UTCTimestamp);
 
-        getRational(&gpsTimeStamp[0], UTCTimestamp->tm_hour, 1);
-        getRational(&gpsTimeStamp[1], UTCTimestamp->tm_min, 1);
-        getRational(&gpsTimeStamp[2], UTCTimestamp->tm_sec, 1);
+    getRational(&gpsTimeStamp[0], UTCTimestamp->tm_hour, 1);
+    getRational(&gpsTimeStamp[1], UTCTimestamp->tm_min, 1);
+    getRational(&gpsTimeStamp[2], UTCTimestamp->tm_sec, 1);
 
-        return NO_ERROR;
-    } else {
-        return BAD_VALUE;
-    }
+    return NO_ERROR;
 }
 
 int32_t getExifExposureValue(srat_t* exposure_val, int32_t exposure_comp,

camera/QCamera2/HAL3/QCamera3HWI.cpp

diff --git a/camera/QCamera2/HAL3/QCamera3HWI.cpp b/camera/QCamera2/HAL3/QCamera3HWI.cpp
index cf88158..d8dd333 100755
--- a/camera/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp
@@ -3194,11 +3194,9 @@
             free(mJpegSettings->gps_timestamp);
             mJpegSettings->gps_timestamp = NULL;
         }
-        if (mJpegSettings->gps_coordinates) {
-            for (int i = 0; i < 3; i++) {
-                free(mJpegSettings->gps_coordinates[i]);
-                mJpegSettings->gps_coordinates[i] = NULL;
-            }
+        for (int i = 0; i < 3; i++) {
+            free(mJpegSettings->gps_coordinates[i]);
+            mJpegSettings->gps_coordinates[i] = NULL;
         }
         free(mJpegSettings);
         mJpegSettings = NULL;