ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix format string"

Browse source
This commit is contained in:
Chih-Hung Hsieh 2014-11-21 04:00:36 +00:00 • committed by Gerrit Code Review
commit 84babf3974
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libprocessgroup/processgroup.cpp
View file

@ -20,6 +20,7 @@
#include <assert.h>
#include <dirent.h>
#include <fcntl.h>
#include <inttypes.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
@ -100,7 +101,7 @@ static int refillBuffer(struct ctx *ctx)
ctx->buf_len += ret;
ctx->buf[ctx->buf_len] = 0;
SLOGV("Read %d to buffer: %s", ret, ctx->buf);
SLOGV("Read %zd to buffer: %s", ret, ctx->buf);
assert(ctx->buf_len <= sizeof(ctx->buf));
@ -251,7 +252,7 @@ int killProcessGroup(uid_t uid, int initialPid, int signal)
{
int processes;
int sleep_us = 100;
long startTime = android::uptimeMillis();
int64_t startTime = android::uptimeMillis();
while ((processes = killProcessGroupOnce(uid, initialPid, signal)) > 0) {
SLOGV("killed %d processes for processgroup %d\n", processes, initialPid);
@ -265,7 +266,7 @@ int killProcessGroup(uid_t uid, int initialPid, int signal)
}
}
SLOGV("Killed process group uid %d pid %d in %ldms, %d procs remain", uid, initialPid,
SLOGV("Killed process group uid %d pid %d in %" PRId64 "ms, %d procs remain", uid, initialPid,
android::uptimeMillis()-startTime, processes);
if (processes == 0) {