am 75b7171f: Merge "Make sdcard log to the log rather than stderr."

* commit '75b7171fcb1a8f898ba533011ccb813792932e4c':
  Make sdcard log to the log rather than stderr.
This commit is contained in:
Elliott Hughes 2014-07-08 21:36:33 +00:00 committed by Android Git Automerger
commit f8acdcbe11

View file

@ -14,6 +14,8 @@
* limitations under the License. * limitations under the License.
*/ */
#define LOG_TAG "sdcard"
#include <ctype.h> #include <ctype.h>
#include <dirent.h> #include <dirent.h>
#include <errno.h> #include <errno.h>
@ -35,6 +37,7 @@
#include <cutils/fs.h> #include <cutils/fs.h>
#include <cutils/hashmap.h> #include <cutils/hashmap.h>
#include <cutils/log.h>
#include <cutils/multiuser.h> #include <cutils/multiuser.h>
#include <private/android_filesystem_config.h> #include <private/android_filesystem_config.h>
@ -90,12 +93,12 @@
#define FUSE_TRACE 0 #define FUSE_TRACE 0
#if FUSE_TRACE #if FUSE_TRACE
#define TRACE(x...) fprintf(stderr,x) #define TRACE(x...) ALOGD(x)
#else #else
#define TRACE(x...) do {} while (0) #define TRACE(x...) do {} while (0)
#endif #endif
#define ERROR(x...) fprintf(stderr,x) #define ERROR(x...) ALOGE(x)
#define FUSE_UNKNOWN_INO 0xffffffff #define FUSE_UNKNOWN_INO 0xffffffff