Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 977fc4e9 authored by Andrew Hsieh's avatar Andrew Hsieh Committed by Android (Google) Code Review
Browse files

Merge "Fixed two 64-bit porting issues; Make pid/tid type consistent"

parents ca3bf255 d2c8f521

include/cutils/logprint.h

+2 −2
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ typedef struct AndroidLogEntry_t { 
    time_t tv_sec;

    long tv_nsec;

    android_LogPriority priority;

    pid_t pid;

    pthread_t tid;

    int32_t pid;

    int32_t tid;

    const char * tag;

    size_t messageLen;

    const char * message;

liblog/fake_log_device.c

+3 −3
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ static void showLog(LogState *state, 
        break;

    case FORMAT_THREAD:

        prefixLen = snprintf(prefixBuf, sizeof(prefixBuf),

            "%c(%5d:%p) ", priChar, pid, (void*)tid);

            "%c(%5d:%5d) ", priChar, pid, tid);

        strcpy(suffixBuf, "\n"); suffixLen = 1;

        break;

    case FORMAT_RAW:
@@ -417,8 +417,8 @@ static void showLog(LogState *state, 
        break;

    case FORMAT_LONG:

        prefixLen = snprintf(prefixBuf, sizeof(prefixBuf),

            "[ %s %5d:%p %c/%-8s ]\n",

            timeBuf, pid, (void*)tid, priChar, tag);

            "[ %s %5d:%5d %c/%-8s ]\n",

            timeBuf, pid, tid, priChar, tag);

        strcpy(suffixBuf, "\n\n"); suffixLen = 2;

        break;

    default:

liblog/logprint.c

+5 −5
Original line number Diff line number Diff line
@@ -673,7 +673,7 @@ int android_log_processBinaryLogBuffer(struct logger_entry *buf, 


    if (inCount != 0) {

        fprintf(stderr,

            "Warning: leftover binary log data (%d bytes)\n", inCount);

            "Warning: leftover binary log data (%zu bytes)\n", inCount);

    }



    /*
@@ -753,7 +753,7 @@ char *android_log_formatLogLine ( 
            break;

        case FORMAT_THREAD:

            prefixLen = snprintf(prefixBuf, sizeof(prefixBuf),

                "%c(%5d:%p) ", priChar, entry->pid, (void*)entry->tid);

                "%c(%5d:%5d) ", priChar, entry->pid, entry->tid);

            strcpy(suffixBuf, "\n");

            suffixLen = 1;

            break;
@@ -773,15 +773,15 @@ char *android_log_formatLogLine ( 
        case FORMAT_THREADTIME:

            prefixLen = snprintf(prefixBuf, sizeof(prefixBuf),

                "%s.%03ld %5d %5d %c %-8s: ", timeBuf, entry->tv_nsec / 1000000,

                (int)entry->pid, (int)entry->tid, priChar, entry->tag);

                entry->pid, entry->tid, priChar, entry->tag);

            strcpy(suffixBuf, "\n");

            suffixLen = 1;

            break;

        case FORMAT_LONG:

            prefixLen = snprintf(prefixBuf, sizeof(prefixBuf),

                "[ %s.%03ld %5d:%p %c/%-8s ]\n",

                "[ %s.%03ld %5d:%5d %c/%-8s ]\n",

                timeBuf, entry->tv_nsec / 1000000, entry->pid,

                (void*)entry->tid, priChar, entry->tag);

                entry->tid, priChar, entry->tag);

            strcpy(suffixBuf, "\n\n");

            suffixLen = 2;

            prefixSuffixIsHeaderFooter = 1;