[cmds] Modernize codebase by replacing NULL with nullptr
Fixes -Wzero-as-null-pointer-constant warning.
Test: m
Bug: 68236239
Change-Id: I1635395d653ace5a11c75795f4a7d2bf2d9e0b1b
Merged-In: I73a0a82e3e32001f8ffb0880250c7023dd8290d3
diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index 506fbd9..2e41eb5 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -226,8 +226,8 @@
static bool g_compress = false;
static bool g_nohup = false;
static int g_initialSleepSecs = 0;
-static const char* g_categoriesFile = NULL;
-static const char* g_kernelTraceFuncs = NULL;
+static const char* g_categoriesFile = nullptr;
+static const char* g_kernelTraceFuncs = nullptr;
static const char* g_debugAppCmdLine = "";
static const char* g_outputFile = nullptr;
@@ -403,7 +403,7 @@
for (int i = 0; i < MAX_SYS_FILES; i++) {
const char* path = category.sysfiles[i].path;
bool req = category.sysfiles[i].required == REQ;
- if (path != NULL) {
+ if (path != nullptr) {
if (req) {
if (!fileIsWritable(path)) {
return false;
@@ -428,7 +428,7 @@
for (int i = 0; i < MAX_SYS_FILES; i++) {
const char* path = category.sysfiles[i].path;
bool req = category.sysfiles[i].required == REQ;
- if (path != NULL) {
+ if (path != nullptr) {
if (req) {
if (!fileExists(path)) {
return false;
@@ -544,10 +544,10 @@
Vector<String16> services = sm->listServices();
for (size_t i = 0; i < services.size(); i++) {
sp<IBinder> obj = sm->checkService(services[i]);
- if (obj != NULL) {
+ if (obj != nullptr) {
Parcel data;
if (obj->transact(IBinder::SYSPROPS_TRANSACTION, data,
- NULL, 0) != OK) {
+ nullptr, 0) != OK) {
if (false) {
// XXX: For some reason this fails on tablets trying to
// poke the "phone" service. It's not clear whether some
@@ -637,9 +637,9 @@
{
int i = 0;
char* start = cmdline;
- while (start != NULL) {
+ while (start != nullptr) {
char* end = strchr(start, ',');
- if (end != NULL) {
+ if (end != nullptr) {
*end = '\0';
end++;
}
@@ -669,7 +669,7 @@
const TracingCategory &c = k_categories[i];
for (int j = 0; j < MAX_SYS_FILES; j++) {
const char* path = c.sysfiles[j].path;
- if (path != NULL && fileIsWritable(path)) {
+ if (path != nullptr && fileIsWritable(path)) {
ok &= setKernelOptionEnable(path, false);
}
}
@@ -705,7 +705,7 @@
ok = false;
}
}
- func = strtok(NULL, ",");
+ func = strtok(nullptr, ",");
}
free(myFuncs);
return ok;
@@ -716,7 +716,7 @@
{
bool ok = true;
- if (funcs == NULL || funcs[0] == '\0') {
+ if (funcs == nullptr || funcs[0] == '\0') {
// Disable kernel function tracing.
if (fileIsWritable(k_currentTracerPath)) {
ok &= writeStr(k_currentTracerPath, "nop");
@@ -738,7 +738,7 @@
char* func = strtok(myFuncs, ",");
while (func) {
ok &= appendStr(k_ftraceFilterPath, func);
- func = strtok(NULL, ",");
+ func = strtok(nullptr, ",");
}
free(myFuncs);
@@ -780,7 +780,7 @@
if (!categories_file) {
return true;
}
- Tokenizer* tokenizer = NULL;
+ Tokenizer* tokenizer = nullptr;
if (Tokenizer::open(String8(categories_file), &tokenizer) != NO_ERROR) {
return false;
}
@@ -882,7 +882,7 @@
for (int j = 0; j < MAX_SYS_FILES; j++) {
const char* path = c.sysfiles[j].path;
bool required = c.sysfiles[j].required == REQ;
- if (path != NULL) {
+ if (path != nullptr) {
if (fileIsWritable(path)) {
ok &= setKernelOptionEnable(path, true);
} else if (required) {
@@ -907,7 +907,7 @@
setTraceOverwriteEnable(true);
setTraceBufferSizeKB(1);
setPrintTgidEnableIfPresent(false);
- setKernelTraceFuncs(NULL);
+ setKernelTraceFuncs(nullptr);
setUserInitiatedTraceProperty(false);
}
@@ -1065,10 +1065,10 @@
sigemptyset(&sa.sa_mask);
sa.sa_flags = 0;
sa.sa_handler = handleSignal;
- sigaction(SIGHUP, &sa, NULL);
- sigaction(SIGINT, &sa, NULL);
- sigaction(SIGQUIT, &sa, NULL);
- sigaction(SIGTERM, &sa, NULL);
+ sigaction(SIGHUP, &sa, nullptr);
+ sigaction(SIGINT, &sa, nullptr);
+ sigaction(SIGQUIT, &sa, nullptr);
+ sigaction(SIGTERM, &sa, nullptr);
}
static void listSupportedCategories()
@@ -1158,13 +1158,13 @@
int ret;
int option_index = 0;
static struct option long_options[] = {
- {"async_start", no_argument, 0, 0 },
- {"async_stop", no_argument, 0, 0 },
- {"async_dump", no_argument, 0, 0 },
- {"only_userspace", no_argument, 0, 0 },
- {"list_categories", no_argument, 0, 0 },
- {"stream", no_argument, 0, 0 },
- { 0, 0, 0, 0 }
+ {"async_start", no_argument, nullptr, 0 },
+ {"async_stop", no_argument, nullptr, 0 },
+ {"async_dump", no_argument, nullptr, 0 },
+ {"only_userspace", no_argument, nullptr, 0 },
+ {"list_categories", no_argument, nullptr, 0 },
+ {"stream", no_argument, nullptr, 0 },
+ {nullptr, 0, nullptr, 0 }
};
ret = getopt_long(argc, argv, "a:b:cf:k:ns:t:zo:",
diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 3af8121..5061745 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -63,7 +63,7 @@
/* read before root is shed */
static char cmdline_buf[16384] = "(unknown)";
-static const char *dump_traces_path = NULL;
+static const char *dump_traces_path = nullptr;
// TODO: variables and functions below should be part of dumpstate object
@@ -267,7 +267,7 @@
char path[PATH_MAX];
d = opendir(driverpath);
- if (d == NULL) {
+ if (d == nullptr) {
return;
}
@@ -559,7 +559,7 @@
static int dump_stat_from_fd(const char *title __unused, const char *path, int fd) {
unsigned long long fields[__STAT_NUMBER_FIELD];
bool z;
- char *cp, *buffer = NULL;
+ char *cp, *buffer = nullptr;
size_t i = 0;
FILE *fp = fdopen(dup(fd), "rb");
getline(&buffer, &i, fp);
@@ -1362,7 +1362,7 @@
| O_CLOEXEC | O_NOFOLLOW)));
if (fd == -1) {
MYLOGE("open(%s): %s\n", filepath.c_str(), strerror(errno));
- return NULL;
+ return nullptr;
}
SHA256_CTX ctx;
@@ -1375,7 +1375,7 @@
break;
} else if (bytes_read == -1) {
MYLOGE("read(%s): %s\n", filepath.c_str(), strerror(errno));
- return NULL;
+ return nullptr;
}
SHA256_Update(&ctx, buffer.data(), bytes_read);
@@ -1423,7 +1423,7 @@
int do_add_date = 0;
int do_zip_file = 0;
int do_vibrate = 1;
- char* use_outfile = 0;
+ char* use_outfile = nullptr;
int use_socket = 0;
int use_control_socket = 0;
int do_fb = 0;
diff --git a/cmds/dumpstate/utils.cpp b/cmds/dumpstate/utils.cpp
index 6b808e3..1eccea5 100644
--- a/cmds/dumpstate/utils.cpp
+++ b/cmds/dumpstate/utils.cpp
@@ -555,13 +555,13 @@
if (PropertiesHelper::IsDryRun()) return;
/* Get size of kernel buffer */
- int size = klogctl(KLOG_SIZE_BUFFER, NULL, 0);
+ int size = klogctl(KLOG_SIZE_BUFFER, nullptr, 0);
if (size <= 0) {
printf("Unexpected klogctl return value: %d\n\n", size);
return;
}
char *buf = (char *) malloc(size + 1);
- if (buf == NULL) {
+ if (buf == nullptr) {
printf("memory allocation failed\n\n");
return;
}
@@ -628,7 +628,7 @@
DurationReporter duration_reporter(title);
DIR *dirp;
struct dirent *d;
- char *newpath = NULL;
+ char *newpath = nullptr;
const char *slash = "/";
int retval = 0;
@@ -641,7 +641,7 @@
++slash;
}
dirp = opendir(dir);
- if (dirp == NULL) {
+ if (dirp == nullptr) {
retval = -errno;
MYLOGE("%s: %s\n", dir, strerror(errno));
return retval;
@@ -650,7 +650,7 @@
if (!dump_from_fd) {
dump_from_fd = dump_file_from_fd;
}
- for (; ((d = readdir(dirp))); free(newpath), newpath = NULL) {
+ for (; ((d = readdir(dirp))); free(newpath), newpath = nullptr) {
if ((d->d_name[0] == '.')
&& (((d->d_name[1] == '.') && (d->d_name[2] == '\0'))
|| (d->d_name[1] == '\0'))) {
@@ -678,7 +678,7 @@
printf("*** %s: %s\n", newpath, strerror(errno));
continue;
}
- (*dump_from_fd)(NULL, newpath, fd.get());
+ (*dump_from_fd)(nullptr, newpath, fd.get());
}
closedir(dirp);
if (!title.empty()) {
diff --git a/cmds/flatland/GLHelper.cpp b/cmds/flatland/GLHelper.cpp
index dfc3e58..d6fb9e7 100644
--- a/cmds/flatland/GLHelper.cpp
+++ b/cmds/flatland/GLHelper.cpp
@@ -29,7 +29,7 @@
mContext(EGL_NO_CONTEXT),
mDummySurface(EGL_NO_SURFACE),
mConfig(0),
- mShaderPrograms(NULL),
+ mShaderPrograms(nullptr),
mDitherTexture(0) {
}
@@ -101,12 +101,12 @@
}
void GLHelper::tearDown() {
- if (mShaderPrograms != NULL) {
+ if (mShaderPrograms != nullptr) {
delete[] mShaderPrograms;
- mShaderPrograms = NULL;
+ mShaderPrograms = nullptr;
}
- if (mSurfaceComposerClient != NULL) {
+ if (mSurfaceComposerClient != nullptr) {
mSurfaceComposerClient->dispose();
mSurfaceComposerClient.clear();
}
@@ -210,7 +210,7 @@
glc->setConsumerUsageBits(GRALLOC_USAGE_HW_COMPOSER);
sp<ANativeWindow> anw = new Surface(producer);
- EGLSurface s = eglCreateWindowSurface(mDisplay, mConfig, anw.get(), NULL);
+ EGLSurface s = eglCreateWindowSurface(mDisplay, mConfig, anw.get(), nullptr);
if (s == EGL_NO_SURFACE) {
fprintf(stderr, "eglCreateWindowSurface error: %#x\n", eglGetError());
return false;
@@ -223,7 +223,7 @@
bool GLHelper::computeWindowScale(uint32_t w, uint32_t h, float* scale) {
sp<IBinder> dpy = mSurfaceComposerClient->getBuiltInDisplay(0);
- if (dpy == NULL) {
+ if (dpy == nullptr) {
fprintf(stderr, "SurfaceComposer::getBuiltInDisplay failed.\n");
return false;
}
@@ -247,7 +247,7 @@
bool result;
status_t err;
- if (mSurfaceComposerClient == NULL) {
+ if (mSurfaceComposerClient == nullptr) {
mSurfaceComposerClient = new SurfaceComposerClient;
}
err = mSurfaceComposerClient->initCheck();
@@ -258,7 +258,7 @@
sp<SurfaceControl> sc = mSurfaceComposerClient->createSurface(
String8("Benchmark"), w, h, PIXEL_FORMAT_RGBA_8888, 0);
- if (sc == NULL || !sc->isValid()) {
+ if (sc == nullptr || !sc->isValid()) {
fprintf(stderr, "Failed to create SurfaceControl.\n");
return false;
}
@@ -289,7 +289,7 @@
SurfaceComposerClient::closeGlobalTransaction();
sp<ANativeWindow> anw = sc->getSurface();
- EGLSurface s = eglCreateWindowSurface(mDisplay, mConfig, anw.get(), NULL);
+ EGLSurface s = eglCreateWindowSurface(mDisplay, mConfig, anw.get(), nullptr);
if (s == EGL_NO_SURFACE) {
fprintf(stderr, "eglCreateWindowSurface error: %#x\n", eglGetError());
return false;
@@ -308,7 +308,7 @@
return false;
}
- glShaderSource(shader, 1, &src, NULL);
+ glShaderSource(shader, 1, &src, nullptr);
glCompileShader(shader);
GLint compiled = 0;
@@ -319,7 +319,7 @@
if (infoLen) {
char* buf = new char[infoLen];
if (buf) {
- glGetShaderInfoLog(shader, infoLen, NULL, buf);
+ glGetShaderInfoLog(shader, infoLen, nullptr, buf);
fprintf(stderr, "Shader compile log:\n%s\n", buf);
delete[] buf;
}
@@ -332,21 +332,21 @@
}
static void printShaderSource(const char* const* src) {
- for (size_t i = 0; i < MAX_SHADER_LINES && src[i] != NULL; i++) {
+ for (size_t i = 0; i < MAX_SHADER_LINES && src[i] != nullptr; i++) {
fprintf(stderr, "%3zu: %s\n", i+1, src[i]);
}
}
static const char* makeShaderString(const char* const* src) {
size_t len = 0;
- for (size_t i = 0; i < MAX_SHADER_LINES && src[i] != NULL; i++) {
+ for (size_t i = 0; i < MAX_SHADER_LINES && src[i] != nullptr; i++) {
// The +1 is for the '\n' that will be added.
len += strlen(src[i]) + 1;
}
char* result = new char[len+1];
char* end = result;
- for (size_t i = 0; i < MAX_SHADER_LINES && src[i] != NULL; i++) {
+ for (size_t i = 0; i < MAX_SHADER_LINES && src[i] != nullptr; i++) {
strcpy(end, src[i]);
end += strlen(src[i]);
*end = '\n';
@@ -390,7 +390,7 @@
if (bufLength) {
char* buf = new char[bufLength];
if (buf) {
- glGetProgramInfoLog(program, bufLength, NULL, buf);
+ glGetProgramInfoLog(program, bufLength, nullptr, buf);
fprintf(stderr, "Program link log:\n%s\n", buf);
delete[] buf;
}
diff --git a/cmds/flatland/Main.cpp b/cmds/flatland/Main.cpp
index 3d7cac0..7ceb397 100644
--- a/cmds/flatland/Main.cpp
+++ b/cmds/flatland/Main.cpp
@@ -284,7 +284,7 @@
public:
Layer() :
- mGLHelper(NULL),
+ mGLHelper(nullptr),
mSurface(EGL_NO_SURFACE) {
}
@@ -316,23 +316,23 @@
}
void tearDown() {
- if (mComposer != NULL) {
+ if (mComposer != nullptr) {
mComposer->tearDown();
delete mComposer;
- mComposer = NULL;
+ mComposer = nullptr;
}
- if (mRenderer != NULL) {
+ if (mRenderer != nullptr) {
mRenderer->tearDown();
delete mRenderer;
- mRenderer = NULL;
+ mRenderer = nullptr;
}
if (mSurface != EGL_NO_SURFACE) {
mGLHelper->destroySurface(&mSurface);
mGLConsumer->abandon();
}
- mGLHelper = NULL;
+ mGLHelper = nullptr;
mGLConsumer.clear();
}
@@ -377,7 +377,7 @@
mDesc(desc),
mInstance(instance),
mNumLayers(countLayers(desc)),
- mGLHelper(NULL),
+ mGLHelper(nullptr),
mSurface(EGL_NO_SURFACE),
mWindowSurface(EGL_NO_SURFACE) {
}
@@ -443,7 +443,7 @@
mLayers[i].tearDown();
}
- if (mGLHelper != NULL) {
+ if (mGLHelper != nullptr) {
if (mWindowSurface != EGL_NO_SURFACE) {
mGLHelper->destroySurface(&mWindowSurface);
}
@@ -453,7 +453,7 @@
mSurfaceControl.clear();
mGLHelper->tearDown();
delete mGLHelper;
- mGLHelper = NULL;
+ mGLHelper = nullptr;
}
}
@@ -553,7 +553,7 @@
static size_t countLayers(const BenchmarkDesc& desc) {
size_t i;
for (i = 0; i < MAX_NUM_LAYERS; i++) {
- if (desc.layers[i].rendererFactory == NULL) {
+ if (desc.layers[i].rendererFactory == nullptr) {
break;
}
}
diff --git a/cmds/lshal/ListCommand.cpp b/cmds/lshal/ListCommand.cpp
index 7760a09..0167bac 100644
--- a/cmds/lshal/ListCommand.cpp
+++ b/cmds/lshal/ListCommand.cpp
@@ -1073,9 +1073,9 @@
i++;
}
// getopt_long last option has all zeros
- ret[i].name = NULL;
+ ret[i].name = nullptr;
ret[i].has_arg = 0;
- ret[i].flag = NULL;
+ ret[i].flag = nullptr;
ret[i].val = 0;
return ret;
diff --git a/cmds/lshal/PipeRelay.cpp b/cmds/lshal/PipeRelay.cpp
index 3828bbf..87d75ac 100644
--- a/cmds/lshal/PipeRelay.cpp
+++ b/cmds/lshal/PipeRelay.cpp
@@ -78,7 +78,7 @@
PipeRelay::~PipeRelay() {
CloseFd(&mFds[1]);
- if (mThread != NULL) {
+ if (mThread != nullptr) {
mThread->join();
mThread.clear();
}
diff --git a/cmds/lshal/Timeout.h b/cmds/lshal/Timeout.h
index c940404..58119a6 100644
--- a/cmds/lshal/Timeout.h
+++ b/cmds/lshal/Timeout.h
@@ -57,7 +57,7 @@
BackgroundTaskState &state = *static_cast<BackgroundTaskState *>(data);
state();
state.notify();
- return NULL;
+ return nullptr;
}
template<class R, class P>
@@ -65,7 +65,7 @@
auto now = std::chrono::system_clock::now();
BackgroundTaskState state{std::forward<decltype(func)>(func)};
pthread_t thread;
- if (pthread_create(&thread, NULL, callAndNotify, &state)) {
+ if (pthread_create(&thread, nullptr, callAndNotify, &state)) {
std::cerr << "FATAL: could not create background thread." << std::endl;
return false;
}
@@ -73,7 +73,7 @@
if (!success) {
pthread_kill(thread, SIGINT);
}
- pthread_join(thread, NULL);
+ pthread_join(thread, nullptr);
return success;
}
diff --git a/cmds/rawbu/backup.cpp b/cmds/rawbu/backup.cpp
index 0072281..8b20e3e 100644
--- a/cmds/rawbu/backup.cpp
+++ b/cmds/rawbu/backup.cpp
@@ -38,7 +38,7 @@
static struct stat statBuffer;
static char copyBuffer[8192];
-static char *backupFilePath = NULL;
+static char *backupFilePath = nullptr;
static uint32_t inputFileVersion;
@@ -58,7 +58,7 @@
{ "/data/system/batterystats.bin", SPECIAL_NO_TOUCH },
{ "/data/system/location", SPECIAL_NO_TOUCH },
{ "/data/dalvik-cache", SPECIAL_NO_BACKUP },
- { NULL, 0 },
+ { nullptr, 0 },
};
/* This is just copied from the shell's built-in wipe command. */
@@ -71,7 +71,7 @@
dir = opendir(path);
- if (dir == NULL) {
+ if (dir == nullptr) {
fprintf (stderr, "Error opendir'ing %s: %s\n",
path, strerror(errno));
return 0;
@@ -87,7 +87,7 @@
for (;;) {
de = readdir(dir);
- if (de == NULL) {
+ if (de == nullptr) {
break;
}
@@ -115,7 +115,7 @@
}
}
- if (!noBackup && SKIP_PATHS[i].path != NULL) {
+ if (!noBackup && SKIP_PATHS[i].path != nullptr) {
// This is a SPECIAL_NO_TOUCH directory.
continue;
}
@@ -203,7 +203,7 @@
int amt = size > (off_t)sizeof(copyBuffer) ? sizeof(copyBuffer) : (int)size;
int readLen = fread(copyBuffer, 1, amt, src);
if (readLen <= 0) {
- if (srcName != NULL) {
+ if (srcName != nullptr) {
fprintf(stderr, "unable to read source (%d of %ld bytes) file '%s': %s\n",
amt, origSize, srcName, errno != 0 ? strerror(errno) : "unexpected EOF");
} else {
@@ -214,7 +214,7 @@
}
int writeLen = fwrite(copyBuffer, 1, readLen, dest);
if (writeLen != readLen) {
- if (destName != NULL) {
+ if (destName != nullptr) {
fprintf(stderr, "unable to write file (%d of %d bytes) '%s': '%s'\n",
writeLen, readLen, destName, strerror(errno));
} else {
@@ -256,14 +256,14 @@
{
DIR *dir;
struct dirent *de;
- char* fullPath = NULL;
+ char* fullPath = nullptr;
int srcLen = strlen(srcPath);
int result = 1;
int i;
dir = opendir(srcPath);
- if (dir == NULL) {
+ if (dir == nullptr) {
fprintf (stderr, "error opendir'ing '%s': %s\n",
srcPath, strerror(errno));
return 0;
@@ -272,7 +272,7 @@
for (;;) {
de = readdir(dir);
- if (de == NULL) {
+ if (de == nullptr) {
break;
}
@@ -283,7 +283,7 @@
continue;
}
- if (fullPath != NULL) {
+ if (fullPath != nullptr) {
free(fullPath);
}
fullPath = (char*)malloc(srcLen + strlen(de->d_name) + 2);
@@ -298,7 +298,7 @@
break;
}
}
- if (SKIP_PATHS[i].path != NULL) {
+ if (SKIP_PATHS[i].path != nullptr) {
continue;
}
}
@@ -343,14 +343,14 @@
}
FILE* src = fopen(fullPath, "r");
- if (src == NULL) {
+ if (src == nullptr) {
fprintf(stderr, "unable to open source file '%s': %s\n",
fullPath, strerror(errno));
result = 0;
goto done;
}
- int copyres = copy_file(fh, src, size, NULL, fullPath);
+ int copyres = copy_file(fh, src, size, nullptr, fullPath);
fclose(src);
if (!copyres) {
result = 0;
@@ -360,7 +360,7 @@
}
done:
- if (fullPath != NULL) {
+ if (fullPath != nullptr) {
free(fullPath);
}
@@ -374,7 +374,7 @@
int res = -1;
FILE* fh = fopen(destPath, "w");
- if (fh == NULL) {
+ if (fh == nullptr) {
fprintf(stderr, "unable to open destination '%s': %s\n",
destPath, strerror(errno));
return -1;
@@ -504,7 +504,7 @@
int res = -1;
FILE* fh = fopen(srcPath, "r");
- if (fh == NULL) {
+ if (fh == nullptr) {
fprintf(stderr, "Unable to open source '%s': %s\n",
srcPath, strerror(errno));
return -1;
@@ -534,7 +534,7 @@
while (1) {
int type;
- char* path = NULL;
+ char* path = nullptr;
if (read_header(fh, &type, &path, &statBuffer) == 0) {
goto done;
}
@@ -570,14 +570,14 @@
printf("Restoring file %s...\n", path);
FILE* dest = fopen(path, "w");
- if (dest == NULL) {
+ if (dest == nullptr) {
fprintf(stderr, "unable to open destination file '%s': %s\n",
path, strerror(errno));
free(path);
goto done;
}
- int copyres = copy_file(dest, fh, size, path, NULL);
+ int copyres = copy_file(dest, fh, size, path, nullptr);
fclose(dest);
if (!copyres) {
free(path);
diff --git a/cmds/service/service.cpp b/cmds/service/service.cpp
index bc11256..34a3fdc 100644
--- a/cmds/service/service.cpp
+++ b/cmds/service/service.cpp
@@ -30,7 +30,7 @@
void writeString16(Parcel& parcel, const char* string)
{
- if (string != NULL)
+ if (string != nullptr)
{
parcel.writeString16(String16(string));
}
@@ -43,7 +43,7 @@
// get the name of the generic interface we hold a reference to
static String16 get_interface_name(sp<IBinder> service)
{
- if (service != NULL) {
+ if (service != nullptr) {
Parcel data, reply;
status_t err = service->transact(IBinder::INTERFACE_TRANSACTION, data, &reply);
if (err == NO_ERROR) {
@@ -93,7 +93,7 @@
#endif
sp<IServiceManager> sm = defaultServiceManager();
fflush(stdout);
- if (sm == NULL) {
+ if (sm == nullptr) {
aerr << "service: Unable to get default service manager!" << endl;
return 20;
}
@@ -106,7 +106,7 @@
if (optind < argc) {
sp<IBinder> service = sm->checkService(String16(argv[optind]));
aout << "Service " << argv[optind] <<
- (service == NULL ? ": not found" : ": found") << endl;
+ (service == nullptr ? ": not found" : ": found") << endl;
} else {
aerr << "service: No service specified for check" << endl;
wantsUsage = true;
@@ -131,7 +131,7 @@
sp<IBinder> service = sm->checkService(String16(argv[optind++]));
String16 ifName = get_interface_name(service);
int32_t code = atoi(argv[optind++]);
- if (service != NULL && ifName.size() > 0) {
+ if (service != nullptr && ifName.size() > 0) {
Parcel data, reply;
// the interface name is first
@@ -186,28 +186,28 @@
data.writeDouble(atof(argv[optind++]));
} else if (strcmp(argv[optind], "null") == 0) {
optind++;
- data.writeStrongBinder(NULL);
+ data.writeStrongBinder(nullptr);
} else if (strcmp(argv[optind], "intent") == 0) {
- char* action = NULL;
- char* dataArg = NULL;
- char* type = NULL;
+ char* action = nullptr;
+ char* dataArg = nullptr;
+ char* type = nullptr;
int launchFlags = 0;
- char* component = NULL;
+ char* component = nullptr;
int categoryCount = 0;
char* categories[16];
- char* context1 = NULL;
+ char* context1 = nullptr;
optind++;
while (optind < argc)
{
char* key = strtok_r(argv[optind], "=", &context1);
- char* value = strtok_r(NULL, "=", &context1);
+ char* value = strtok_r(nullptr, "=", &context1);
// we have reached the end of the XXX=XXX args.
- if (key == NULL) break;
+ if (key == nullptr) break;
if (strcmp(key, "action") == 0)
{
@@ -231,14 +231,14 @@
}
else if (strcmp(key, "categories") == 0)
{
- char* context2 = NULL;
+ char* context2 = nullptr;
int categoryCount = 0;
categories[categoryCount] = strtok_r(value, ",", &context2);
- while (categories[categoryCount] != NULL)
+ while (categories[categoryCount] != nullptr)
{
categoryCount++;
- categories[categoryCount] = strtok_r(NULL, ",", &context2);
+ categories[categoryCount] = strtok_r(nullptr, ",", &context2);
}
}
diff --git a/cmds/surfacereplayer/replayer/Main.cpp b/cmds/surfacereplayer/replayer/Main.cpp
index 7090bdb..fbfcacf 100644
--- a/cmds/surfacereplayer/replayer/Main.cpp
+++ b/cmds/surfacereplayer/replayer/Main.cpp
@@ -94,7 +94,7 @@
}
char** input = argv + optind;
- if (input[0] == NULL) {
+ if (input[0] == nullptr) {
std::cerr << "No trace file provided...exiting" << std::endl;
abort();
}