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

Commit 5cd5da9e authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "liblog: replace crufty min macro with existing MIN."

parents c63ef7fc 6efbda73

liblog/logd_reader.cpp

+8 −10
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <sys/param.h>

#include <sys/socket.h>

#include <sys/stat.h>

#include <sys/types.h>
@@ -38,9 +39,6 @@ 
#include "logd_reader.h"

#include "logger.h"



/* branchless on many architectures. */

#define min(x, y) ((y) ^ (((x) ^ (y)) & -((x) < (y))))



static int logdAvailable(log_id_t LogId);

static int logdVersion(struct android_log_logger* logger,

                       struct android_log_transport_context* transp);
@@ -278,13 +276,13 @@ static ssize_t logdGetStats(struct android_log_logger_list* logger_list, 
  size_t n;



  n = snprintf(cp, remaining, "getStatistics");

  n = min(n, remaining);

  n = MIN(n, remaining);

  remaining -= n;

  cp += n;



  logger_for_each(logger, logger_list) {

    n = snprintf(cp, remaining, " %d", logger->logId);

    n = min(n, remaining);

    n = MIN(n, remaining);

    remaining -= n;

    cp += n;

  }
@@ -361,7 +359,7 @@ static int logdOpen(struct android_log_logger_list* logger_list, 
  remaining = sizeof(buffer) - (cp - buffer);

  logger_for_each(logger, logger_list) {

    ret = snprintf(cp, remaining, "%c%u", c, logger->logId);

    ret = min(ret, remaining);

    ret = MIN(ret, remaining);

    remaining -= ret;

    cp += ret;

    c = ',';
@@ -369,7 +367,7 @@ static int logdOpen(struct android_log_logger_list* logger_list, 


  if (logger_list->tail) {

    ret = snprintf(cp, remaining, " tail=%u", logger_list->tail);

    ret = min(ret, remaining);

    ret = MIN(ret, remaining);

    remaining -= ret;

    cp += ret;

  }
@@ -378,20 +376,20 @@ static int logdOpen(struct android_log_logger_list* logger_list, 
    if (logger_list->mode & ANDROID_LOG_WRAP) {

      // ToDo: alternate API to allow timeout to be adjusted.

      ret = snprintf(cp, remaining, " timeout=%u", ANDROID_LOG_WRAP_DEFAULT_TIMEOUT);

      ret = min(ret, remaining);

      ret = MIN(ret, remaining);

      remaining -= ret;

      cp += ret;

    }

    ret = snprintf(cp, remaining, " start=%" PRIu32 ".%09" PRIu32, logger_list->start.tv_sec,

                   logger_list->start.tv_nsec);

    ret = min(ret, remaining);

    ret = MIN(ret, remaining);

    remaining -= ret;

    cp += ret;

  }



  if (logger_list->pid) {

    ret = snprintf(cp, remaining, " pid=%u", logger_list->pid);

    ret = min(ret, remaining);

    ret = MIN(ret, remaining);

    cp += ret;

  }

liblog/logd_writer.cpp

+0 −3
Original line number Diff line number Diff line
@@ -38,9 +38,6 @@ 
#include "logger.h"

#include "uio.h"



/* branchless on many architectures. */

#define min(x, y) ((y) ^ (((x) ^ (y)) & -((x) < (y))))



static int logdAvailable(log_id_t LogId);

static int logdOpen();

static void logdClose();