am 10de2beb: Merge "Fix some bugs caught by warnings."

* commit '10de2bebb7bc9793483858824143cfe21a5dff85':
  Fix some bugs caught by warnings.

4 files changed, 40 insertions, 54 deletions

diff --git a/6515/libsensors_iio/Android.mk b/6515/libsensors_iio/Android.mk
index 7ae62cd..bf72b75 100755
--- a/6515/libsensors_iio/Android.mk
+++ b/6515/libsensors_iio/Android.mk
@@ -24,7 +24,7 @@ LOCAL_MODULE := libinvensense_hal
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_OWNER := invensense
 
-LOCAL_CFLAGS := -DLOG_TAG=\"Sensors\"
+LOCAL_CFLAGS := -DLOG_TAG=\"Sensors\" -Werror -Wall
 
 LOCAL_CFLAGS += -DANDROID_KITKAT
 
@@ -115,7 +115,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/software/core/driver/include/linux
 
 LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE_TAGS := optional
-LOCAL_CFLAGS := -DLOG_TAG=\"Sensors\"
+LOCAL_CFLAGS := -DLOG_TAG=\"Sensors\" -Werror -Wall
 
 LOCAL_CFLAGS += -DANDROID_KITKAT
 
diff --git a/6515/libsensors_iio/CompassSensor.IIO.9150.cpp b/6515/libsensors_iio/CompassSensor.IIO.9150.cpp
index d896212..585cc2e 100755
--- a/6515/libsensors_iio/CompassSensor.IIO.9150.cpp
+++ b/6515/libsensors_iio/CompassSensor.IIO.9150.cpp
@@ -368,28 +368,23 @@ int CompassSensor::inv_init_sysfs_attributes(void)
 {
     VFUNC_LOG;
 
-    unsigned char i = 0;
     char sysfs_path[MAX_SYSFS_NAME_LEN];
-    char iio_trigger_path[MAX_SYSFS_NAME_LEN], tbuf[2];
-    char *sptr;
-    char **dptr;
-    int num;
+    char iio_trigger_path[MAX_SYSFS_NAME_LEN];
 
-    pathP = (char*)malloc(
-                    sizeof(char[COMPASS_MAX_SYSFS_ATTRB][MAX_SYSFS_NAME_LEN]));
-    sptr = pathP;
-    dptr = (char**)&compassSysFs;
-    if (sptr == NULL)
+    pathP = (char*)calloc(COMPASS_MAX_SYSFS_ATTRB,
+                          sizeof(char[MAX_SYSFS_NAME_LEN]));
+    if (pathP == NULL)
         return -1;
 
     memset(sysfs_path, 0, sizeof(sysfs_path));
     memset(iio_trigger_path, 0, sizeof(iio_trigger_path));
 
-    do {
-        *dptr++ = sptr;
-        memset(sptr, 0, sizeof(sptr));
-        sptr += sizeof(char[MAX_SYSFS_NAME_LEN]);
-    } while (++i < COMPASS_MAX_SYSFS_ATTRB);
+    char *sptr = pathP;
+    char **dptr = reinterpret_cast<char **>(&compassSysFs);
+    for (size_t i = 0; i < COMPASS_MAX_SYSFS_ATTRB; i++) {
+      *dptr++ = sptr;
+      sptr += sizeof(char[MAX_SYSFS_NAME_LEN]);
+    }
 
     // get proper (in absolute/relative) IIO path & build MPU's sysfs paths
     // inv_get_sysfs_abs_path(sysfs_path);
@@ -397,6 +392,9 @@ int CompassSensor::inv_init_sysfs_attributes(void)
     inv_get_iio_trigger_path(iio_trigger_path);
 
 #if defined COMPASS_AK8975
+    char tbuf[2];
+    int num;
+
     inv_get_input_number(dev_name, &num);
     tbuf[0] = num + 0x30;
     tbuf[1] = 0;
@@ -415,12 +413,5 @@ int CompassSensor::inv_init_sysfs_attributes(void)
     sprintf(compassSysFs.compass_orient, "%s%s", sysfs_path, "/compass_matrix");
 #endif
 
-#if 0
-    // test print sysfs paths   
-    dptr = (char**)&compassSysFs;
-    for (i = 0; i < COMPASS_MAX_SYSFS_ATTRB; i++) {
-        LOGE("HAL:sysfs path: %s", *dptr++);
-    }
-#endif
     return 0;
 }
diff --git a/6515/libsensors_iio/MPLSensor.cpp b/6515/libsensors_iio/MPLSensor.cpp
index 2106060..de37fac 100644
--- a/6515/libsensors_iio/MPLSensor.cpp
+++ b/6515/libsensors_iio/MPLSensor.cpp
@@ -3637,7 +3637,7 @@ int MPLSensor::readEvents(sensors_event_t* data, int count)
         mDataMarkerDetected = 0;
 
         // handle flush complete event
-        for(int k = 0; k < mFlushSensorEnabledVector.size(); k++) {
+        for(size_t k = 0; k < mFlushSensorEnabledVector.size(); k++) {
             int sendEvent = metaHandler(&mPendingFlushEvents[k], META_DATA_FLUSH_COMPLETE);
             if(sendEvent && count > 0) {
                 *data++ = mPendingFlushEvents[k];
@@ -3725,7 +3725,7 @@ void MPLSensor::buildMpuEvent(void)
     /* append with just read data */
     if (mLeftOverBufferSize > 0) {
         LOGV_IF(0, "append old buffer size=%d", mLeftOverBufferSize);
-        memset(rdata, 0, sizeof(rdata));
+        memset(rdata, 0, sizeof(mIIOBuffer));
         memcpy(rdata, mLeftOverBuffer, mLeftOverBufferSize);
             LOGV_IF(0,
             "HAL:input retrieve old buffer data=:%d, %d, %d, %d,%d, %d, %d, %d,%d, %d, "
@@ -5064,30 +5064,24 @@ int MPLSensor::inv_init_sysfs_attributes(void)
 {
     VFUNC_LOG;
 
-    unsigned char i = 0;
     char sysfs_path[MAX_SYSFS_NAME_LEN];
-    char tbuf[2];
-    char *sptr;
-    char **dptr;
-    int num;
 
     memset(sysfs_path, 0, sizeof(sysfs_path));
 
-    sysfs_names_ptr =
-            (char*)malloc(sizeof(char[MAX_SYSFS_ATTRB][MAX_SYSFS_NAME_LEN]));
-    sptr = sysfs_names_ptr;
-    if (sptr != NULL) {
-        dptr = (char**)&mpu;
-        do {
-            *dptr++ = sptr;
-            memset(sptr, 0, sizeof(sptr));
-            sptr += sizeof(char[MAX_SYSFS_NAME_LEN]);
-        } while (++i < MAX_SYSFS_ATTRB);
-    } else {
+    sysfs_names_ptr = (char*)calloc(MAX_SYSFS_ATTRB,
+                                    sizeof(char[MAX_SYSFS_NAME_LEN]));
+    if (sysfs_names_ptr == NULL) {
         LOGE("HAL:couldn't alloc mem for sysfs paths");
         return -1;
     }
 
+    char *sptr = sysfs_names_ptr;
+    char **dptr = reinterpret_cast<char **>(&mpu);
+    for (size_t i = 0; i < MAX_SYSFS_ATTRB; i++) {
+      *dptr++ = sptr;
+      sptr += sizeof(char[MAX_SYSFS_NAME_LEN]);
+    }
+
     // get proper (in absolute) IIO path & build MPU's sysfs paths
     inv_get_sysfs_path(sysfs_path);
 
diff --git a/6515/libsensors_iio/PressureSensor.IIO.secondary.cpp b/6515/libsensors_iio/PressureSensor.IIO.secondary.cpp
index 039881e..be11b6f 100755
--- a/6515/libsensors_iio/PressureSensor.IIO.secondary.cpp
+++ b/6515/libsensors_iio/PressureSensor.IIO.secondary.cpp
@@ -181,20 +181,21 @@ void PressureSensor::fillList(struct sensor_t *list)
 int PressureSensor::inv_init_sysfs_attributes(void)
 {
     VFUNC_LOG;
- 
-    pathP = (char*)malloc(sizeof(char[PRESSURE_MAX_SYSFS_ATTRB][MAX_SYSFS_NAME_LEN]));
-    char *sptr = pathP;
-    char **dptr = (char**)&pressureSysFs;
-    if (sptr == NULL)
+
+    pathP = (char*)calloc(PRESSURE_MAX_SYSFS_ATTRB,
+                          sizeof(char[MAX_SYSFS_NAME_LEN]));
+    if (pathP == NULL)
         return -1;
-    unsigned char i = 0;
-    do {
-        *dptr++ = sptr;
-        memset(sptr, 0, sizeof(sptr));
-        sptr += sizeof(char[MAX_SYSFS_NAME_LEN]);
-    } while (++i < PRESSURE_MAX_SYSFS_ATTRB);
- 
+
+    char *sptr = pathP;
+    char **dptr = reinterpret_cast<char **>(&pressureSysFs);
+    for (size_t i = 0; i < PRESSURE_MAX_SYSFS_ATTRB; i++) {
+      *dptr++ = sptr;
+      sptr += sizeof(char[MAX_SYSFS_NAME_LEN]);
+    }
+
     sprintf(pressureSysFs.pressure_enable, "%s%s", mSysfsPath, "/pressure_enable");
     sprintf(pressureSysFs.pressure_rate, "%s%s", mSysfsPath, "/pressure_rate");
+
     return 0;
 }