commit 97ac40e4e6f3ed0bd5d6878d7d8d4a54fcaecb76
author San Mehat <san@google.com> Wed Mar 24 10:24:19 2010 -0700
committer San Mehat <san@google.com> Thu Mar 25 08:02:28 2010 -0700
tree 824665f991e4ec6aa6a6a0fbf491a06e24cae500
parent da62e7c00259f6b98696cedb7d031f04951caef0

vold: Switch from LOG -> SLOG

Change-Id: I48ee8bd90b47f5845f069cdf4d1b8ba6ecdb1b39
Signed-off-by: San Mehat <san@google.com>

Devmapper.cpp

diff --git a/Devmapper.cpp b/Devmapper.cpp
index ec36fdb..c9482bf 100644
--- a/Devmapper.cpp
+++ b/Devmapper.cpp
@@ -38,21 +38,21 @@
 
     char *buffer = (char *) malloc(1024 * 64);
     if (!buffer) {
-        LOGE("Error allocating memory (%s)", strerror(errno));
+        SLOGE("Error allocating memory (%s)", strerror(errno));
         return -1;
     }
     memset(buffer, 0, (1024 * 64));
 
     char *buffer2 = (char *) malloc(4096);
     if (!buffer2) {
-        LOGE("Error allocating memory (%s)", strerror(errno));
+        SLOGE("Error allocating memory (%s)", strerror(errno));
         free(buffer);
         return -1;
     }
 
     int fd;
     if ((fd = open("/dev/device-mapper", O_RDWR)) < 0) {
-        LOGE("Error opening devmapper (%s)", strerror(errno));
+        SLOGE("Error opening devmapper (%s)", strerror(errno));
         free(buffer);
         free(buffer2);
         return -1;
@@ -62,7 +62,7 @@
     ioctlInit(io, (1024 * 64), NULL, 0);
 
     if (ioctl(fd, DM_LIST_DEVICES, io)) {
-        LOGE("DM_LIST_DEVICES ioctl failed (%s)", strerror(errno));
+        SLOGE("DM_LIST_DEVICES ioctl failed (%s)", strerror(errno));
         free(buffer);
         free(buffer2);
         close(fd);
@@ -86,7 +86,7 @@
         ioctlInit(io2, 4096, n->name, 0);
         if (ioctl(fd, DM_DEV_STATUS, io2)) {
             if (errno != ENXIO) {
-                LOGE("DM_DEV_STATUS ioctl failed (%s)", strerror(errno));
+                SLOGE("DM_DEV_STATUS ioctl failed (%s)", strerror(errno));
             }
             io2 = NULL;
         }
@@ -127,13 +127,13 @@
 int Devmapper::lookupActive(const char *name, char *ubuffer, size_t len) {
     char *buffer = (char *) malloc(4096);
     if (!buffer) {
-        LOGE("Error allocating memory (%s)", strerror(errno));
+        SLOGE("Error allocating memory (%s)", strerror(errno));
         return -1;
     }
 
     int fd;
     if ((fd = open("/dev/device-mapper", O_RDWR)) < 0) {
-        LOGE("Error opening devmapper (%s)", strerror(errno));
+        SLOGE("Error opening devmapper (%s)", strerror(errno));
         free(buffer);
         return -1;
     }
@@ -143,7 +143,7 @@
     ioctlInit(io, 4096, name, 0);
     if (ioctl(fd, DM_DEV_STATUS, io)) {
         if (errno != ENXIO) {
-            LOGE("DM_DEV_STATUS ioctl failed for lookup (%s)", strerror(errno));
+            SLOGE("DM_DEV_STATUS ioctl failed for lookup (%s)", strerror(errno));
         }
         free(buffer);
         close(fd);
@@ -161,13 +161,13 @@
                       unsigned int numSectors, char *ubuffer, size_t len) {
     char *buffer = (char *) malloc(4096);
     if (!buffer) {
-        LOGE("Error allocating memory (%s)", strerror(errno));
+        SLOGE("Error allocating memory (%s)", strerror(errno));
         return -1;
     }
 
     int fd;
     if ((fd = open("/dev/device-mapper", O_RDWR)) < 0) {
-        LOGE("Error opening devmapper (%s)", strerror(errno));
+        SLOGE("Error opening devmapper (%s)", strerror(errno));
         free(buffer);
         return -1;
     }
@@ -178,7 +178,7 @@
     ioctlInit(io, 4096, name, 0);
 
     if (ioctl(fd, DM_DEV_CREATE, io)) {
-        LOGE("Error creating device mapping (%s)", strerror(errno));
+        SLOGE("Error creating device mapping (%s)", strerror(errno));
         free(buffer);
         close(fd);
         return -1;
@@ -193,7 +193,7 @@
     geoParams += strlen(geoParams) + 1;
     geoParams = (char *) _align(geoParams, 8);
     if (ioctl(fd, DM_DEV_SET_GEOMETRY, io)) {
-        LOGE("Error setting device geometry (%s)", strerror(errno));
+        SLOGE("Error setting device geometry (%s)", strerror(errno));
         free(buffer);
         close(fd);
         return -1;
@@ -202,7 +202,7 @@
     // Retrieve the device number we were allocated
     ioctlInit(io, 4096, name, 0);
     if (ioctl(fd, DM_DEV_STATUS, io)) {
-        LOGE("Error retrieving devmapper status (%s)", strerror(errno));
+        SLOGE("Error retrieving devmapper status (%s)", strerror(errno));
         free(buffer);
         close(fd);
         return -1;
@@ -231,7 +231,7 @@
     tgt->next = cryptParams - buffer;
 
     if (ioctl(fd, DM_TABLE_LOAD, io)) {
-        LOGE("Error loading mapping table (%s)", strerror(errno));
+        SLOGE("Error loading mapping table (%s)", strerror(errno));
         free(buffer);
         close(fd);
         return -1;
@@ -241,7 +241,7 @@
     ioctlInit(io, 4096, name, 0);
 
     if (ioctl(fd, DM_DEV_SUSPEND, io)) {
-        LOGE("Error Resuming (%s)", strerror(errno));
+        SLOGE("Error Resuming (%s)", strerror(errno));
         free(buffer);
         close(fd);
         return -1;
@@ -256,13 +256,13 @@
 int Devmapper::destroy(const char *name) {
     char *buffer = (char *) malloc(4096);
     if (!buffer) {
-        LOGE("Error allocating memory (%s)", strerror(errno));
+        SLOGE("Error allocating memory (%s)", strerror(errno));
         return -1;
     }
 
     int fd;
     if ((fd = open("/dev/device-mapper", O_RDWR)) < 0) {
-        LOGE("Error opening devmapper (%s)", strerror(errno));
+        SLOGE("Error opening devmapper (%s)", strerror(errno));
         free(buffer);
         return -1;
     }
@@ -274,7 +274,7 @@
 
     if (ioctl(fd, DM_DEV_REMOVE, io)) {
         if (errno != ENXIO) {
-            LOGE("Error destroying device mapping (%s)", strerror(errno));
+            SLOGE("Error destroying device mapping (%s)", strerror(errno));
         }
         free(buffer);
         close(fd);