Merge pull request #11 from ctiller/mac

Compile fix for mac
pull/25/merge
Nicolas Noble 10 years ago
commit 29512b56d0
  1. 16
      src/core/support/log_posix.c

@ -31,21 +31,27 @@
* *
*/ */
#define _POSIX_SOURCE
#ifndef _POSIX_C_SOURCE
#define _POSIX_C_SOURCE 200112L
#endif
#define _GNU_SOURCE #define _GNU_SOURCE
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
#if defined(GPR_POSIX_LOG) #if defined(GPR_POSIX_LOG)
#include <grpc/support/alloc.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include <grpc/support/time.h> #include <grpc/support/time.h>
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
#include <string.h> #include <string.h>
#include <stdio.h>
#include <time.h> #include <time.h>
#include <pthread.h> #include <pthread.h>
static long gettid() { return pthread_self(); } static gpr_intptr gettid() { return (gpr_intptr)pthread_self(); }
void gpr_log(const char *file, int line, gpr_log_severity severity, void gpr_log(const char *file, int line, gpr_log_severity severity,
const char *format, ...) { const char *format, ...) {
@ -55,7 +61,7 @@ void gpr_log(const char *file, int line, gpr_log_severity severity,
int ret; int ret;
va_list args; va_list args;
va_start(args, format); va_start(args, format);
ret = vsnprintf(buf, format, args); ret = vsnprintf(buf, sizeof(buf), format, args);
va_end(args); va_end(args);
if (ret < 0) { if (ret < 0) {
message = NULL; message = NULL;
@ -64,7 +70,7 @@ void gpr_log(const char *file, int line, gpr_log_severity severity,
} else { } else {
message = allocated = gpr_malloc(ret + 1); message = allocated = gpr_malloc(ret + 1);
va_start(args, format); va_start(args, format);
vsnprintf(message, format, args); vsnprintf(message, ret, format, args);
va_end(args); va_end(args);
} }
gpr_log_message(file, line, severity, message); gpr_log_message(file, line, severity, message);
@ -91,7 +97,7 @@ void gpr_default_log(gpr_log_func_args *args) {
strcpy(time_buffer, "error:strftime"); strcpy(time_buffer, "error:strftime");
} }
fprintf(stderr, "%s%s.%09d %7ld %s:%d] %s\n", fprintf(stderr, "%s%s.%09d %7tu %s:%d] %s\n",
gpr_log_severity_string(args->severity), time_buffer, gpr_log_severity_string(args->severity), time_buffer,
(int)(now.tv_nsec), gettid(), display_file, args->line, (int)(now.tv_nsec), gettid(), display_file, args->line,
args->message); args->message);

Loading…
Cancel
Save