tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)

Browse source 
Change-Id: I6c2a1d56dadb7e5c69e478f4d8c7d9f2127db2af
This commit is contained in:
Steve Block 2012-01-05 22:25:38 +00:00
parent 4163b45949
commit 4f07a1f826
26 changed files with 111 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
include/cutils/log.h
View file

@ -149,17 +149,23 @@ extern "C" {
/*
* Simplified macro to send a warning log message using the current LOG_TAG.
*/
#ifndef ALOGW
#define ALOGW(...) ((void)ALOG(LOG_WARN, LOG_TAG, __VA_ARGS__))
// Temporary measure for code still using old LOG macros.
#ifndef LOGW
#define LOGW(...) ((void)ALOG(LOG_WARN, LOG_TAG, __VA_ARGS__))
#define ALOGW LOGW
#define LOGW ALOGW
#endif
#endif
#ifndef LOGW_IF
#define LOGW_IF(cond, ...) \
#ifndef ALOGW_IF
#define ALOGW_IF(cond, ...) \
( (CONDITION(cond)) \
? ((void)ALOG(LOG_WARN, LOG_TAG, __VA_ARGS__)) \
: (void)0 )
#define ALOGW_IF LOGW_IF
// Temporary measure for code still using old LOG macros.
#ifndef LOGW_IF
#define LOGW_IF ALOGW_IF
#endif
#endif
/*
@ -224,9 +230,12 @@ extern "C" {
* Conditional based on whether the current LOG_TAG is enabled at
* warn priority.
*/
#ifndef IF_ALOGW
#define IF_ALOGW() IF_ALOG(LOG_WARN, LOG_TAG)
// Temporary measure for code still using old LOG macros.
#ifndef IF_LOGW
#define IF_LOGW() IF_ALOG(LOG_WARN, LOG_TAG)
#define IF_ALOGW IF_LOGW
#define IF_LOGW IF_ALOGW
#endif
#endif
/*

2
libcutils/loghack.h
View file

@ -30,7 +30,7 @@
#define ALOGV(...) ALOG("V", __VA_ARGS__)
#define ALOGD(...) ALOG("D", __VA_ARGS__)
#define ALOGI(...) ALOG("I", __VA_ARGS__)
#define LOGW(...) ALOG("W", __VA_ARGS__)
#define ALOGW(...) ALOG("W", __VA_ARGS__)
#define LOGE(...) ALOG("E", __VA_ARGS__)
#define LOG_ALWAYS_FATAL(...) do { LOGE(__VA_ARGS__); exit(1); } while (0)
#endif

38
libcutils/mq.c
View file

@ -222,7 +222,7 @@ static void setNonBlocking(int fd) {
static void closeWithWarning(int fd) {
int result = close(fd);
if (result == -1) {
LOGW("close() error: %s", strerror(errno));
ALOGW("close() error: %s", strerror(errno));
}
}
@ -433,12 +433,12 @@ static void peerProxyKill(PeerProxy* peerProxy, bool errnoIsSet) {
static void peerProxyHandleError(PeerProxy* peerProxy, char* functionName) {
if (errno == EINTR) {
// Log interruptions but otherwise ignore them.
LOGW("%s() interrupted.", functionName);
ALOGW("%s() interrupted.", functionName);
} else if (errno == EAGAIN) {
ALOGD("EWOULDBLOCK");
// Ignore.
} else {
LOGW("Error returned by %s().", functionName);
ALOGW("Error returned by %s().", functionName);
peerProxyKill(peerProxy, true);
}
}
@ -583,7 +583,7 @@ static void peerProxyExpectBytes(PeerProxy* peerProxy, Header* header) {
peerProxy->inputState = READING_BYTES;
if (bufferPrepareForRead(peerProxy->inputBuffer, header->size) == -1) {
LOGW("Couldn't allocate memory for incoming data. Size: %u",
ALOGW("Couldn't allocate memory for incoming data. Size: %u",
(unsigned int) header->size);
// TODO: Ignore the packet and log a warning?
@ -670,7 +670,7 @@ static void masterProxyExpectConnection(PeerProxy* masterProxy,
// TODO: Restructure things so we don't need this check.
// Verify that this really is the master.
if (!masterProxy->master) {
LOGW("Non-master process %d tried to send us a connection.",
ALOGW("Non-master process %d tried to send us a connection.",
masterProxy->credentials.pid);
// Kill off the evil peer.
peerProxyKill(masterProxy, false);
@ -686,7 +686,7 @@ static void masterProxyExpectConnection(PeerProxy* masterProxy,
peerLock(localPeer);
PeerProxy* peerProxy = peerProxyGetOrCreate(localPeer, pid, false);
if (peerProxy == NULL) {
LOGW("Peer proxy creation failed: %s", strerror(errno));
ALOGW("Peer proxy creation failed: %s", strerror(errno));
} else {
// Fill in full credentials.
peerProxy->credentials = header->credentials;
@ -746,7 +746,7 @@ static void masterProxyAcceptConnection(PeerProxy* masterProxy) {
if (size < 0) {
if (errno == EINTR) {
// Log interruptions but otherwise ignore them.
LOGW("recvmsg() interrupted.");
ALOGW("recvmsg() interrupted.");
return;
} else if (errno == EAGAIN) {
// Keep waiting for the connection.
@ -777,14 +777,14 @@ static void masterProxyAcceptConnection(PeerProxy* masterProxy) {
// The peer proxy this connection is for.
PeerProxy* peerProxy = masterProxy->connecting;
if (peerProxy == NULL) {
LOGW("Received connection for unknown peer.");
ALOGW("Received connection for unknown peer.");
closeWithWarning(incomingFd);
} else {
Peer* peer = masterProxy->peer;
SelectableFd* selectableFd = selectorAdd(peer->selector, incomingFd);
if (selectableFd == NULL) {
LOGW("Error adding fd to selector for %d.",
ALOGW("Error adding fd to selector for %d.",
peerProxy->credentials.pid);
closeWithWarning(incomingFd);
peerProxyKill(peerProxy, false);
@ -811,7 +811,7 @@ static void masterConnectPeers(PeerProxy* peerA, PeerProxy* peerB) {
int sockets[2];
int result = socketpair(AF_LOCAL, SOCK_STREAM, 0, sockets);
if (result == -1) {
LOGW("socketpair() error: %s", strerror(errno));
ALOGW("socketpair() error: %s", strerror(errno));
// TODO: Send CONNECTION_FAILED packets to peers.
return;
}
@ -821,7 +821,7 @@ static void masterConnectPeers(PeerProxy* peerA, PeerProxy* peerB) {
if (packetA == NULL || packetB == NULL) {
free(packetA);
free(packetB);
LOGW("malloc() error. Failed to tell process %d that process %d is"
ALOGW("malloc() error. Failed to tell process %d that process %d is"
" dead.", peerA->credentials.pid, peerB->credentials.pid);
return;
}
@ -852,7 +852,7 @@ static void masterReportConnectionError(PeerProxy* peerProxy,
Credentials credentials) {
OutgoingPacket* packet = calloc(1, sizeof(OutgoingPacket));
if (packet == NULL) {
LOGW("malloc() error. Failed to tell process %d that process %d is"
ALOGW("malloc() error. Failed to tell process %d that process %d is"
" dead.", peerProxy->credentials.pid, credentials.pid);
return;
}
@ -905,7 +905,7 @@ static void masterProxyHandleConnectionError(PeerProxy* masterProxy,
ALOGI("Couldn't connect to %d.", pid);
peerProxyKill(peerProxy, false);
} else {
LOGW("Peer proxy for %d not found. This shouldn't happen.", pid);
ALOGW("Peer proxy for %d not found. This shouldn't happen.", pid);
}
peerProxyExpectHeader(masterProxy);
@ -929,7 +929,7 @@ static void peerProxyHandleHeader(PeerProxy* peerProxy, Header* header) {
peerProxyExpectBytes(peerProxy, header);
break;
default:
LOGW("Invalid packet type from %d: %d", peerProxy->credentials.pid,
ALOGW("Invalid packet type from %d: %d", peerProxy->credentials.pid,
header->type);
peerProxyKill(peerProxy, false);
}
@ -1026,7 +1026,7 @@ static void masterAcceptConnection(SelectableFd* listenerFd) {
// Accept connection.
int socket = accept(listenerFd->fd, NULL, NULL);
if (socket == -1) {
LOGW("accept() error: %s", strerror(errno));
ALOGW("accept() error: %s", strerror(errno));
return;
}
@ -1040,7 +1040,7 @@ static void masterAcceptConnection(SelectableFd* listenerFd) {
&ucredentials, &credentialsSize);
// We might want to verify credentialsSize.
if (result == -1) {
LOGW("getsockopt() error: %s", strerror(errno));
ALOGW("getsockopt() error: %s", strerror(errno));
closeWithWarning(socket);
return;
}
@ -1061,7 +1061,7 @@ static void masterAcceptConnection(SelectableFd* listenerFd) {
= hashmapGet(masterPeer->peerProxies, &credentials.pid);
if (peerProxy != NULL) {
peerUnlock(masterPeer);
LOGW("Alread connected to process %d.", credentials.pid);
ALOGW("Alread connected to process %d.", credentials.pid);
closeWithWarning(socket);
return;
}
@ -1070,7 +1070,7 @@ static void masterAcceptConnection(SelectableFd* listenerFd) {
SelectableFd* socketFd = selectorAdd(masterPeer->selector, socket);
if (socketFd == NULL) {
peerUnlock(masterPeer);
LOGW("malloc() failed.");
ALOGW("malloc() failed.");
closeWithWarning(socket);
return;
}
@ -1079,7 +1079,7 @@ static void masterAcceptConnection(SelectableFd* listenerFd) {
peerProxy = peerProxyCreate(masterPeer, credentials);
peerUnlock(masterPeer);
if (peerProxy == NULL) {
LOGW("malloc() failed.");
ALOGW("malloc() failed.");
socketFd->remove = true;
closeWithWarning(socket);
}

6
libcutils/properties.c
View file

@ -99,7 +99,7 @@ static int connectToServer(const char* fileName)
sock = socket(AF_UNIX, SOCK_STREAM, 0);
if (sock < 0) {
LOGW("UNIX domain socket create failed (errno=%d)\n", errno);
ALOGW("UNIX domain socket create failed (errno=%d)\n", errno);
return -1;
}
@ -110,7 +110,7 @@ static int connectToServer(const char* fileName)
if (cc < 0) {
// ENOENT means socket file doesn't exist
// ECONNREFUSED means socket exists but nobody is listening
//LOGW("AF_UNIX connect failed for '%s': %s\n",
//ALOGW("AF_UNIX connect failed for '%s': %s\n",
// fileName, strerror(errno));
close(sock);
return -1;
@ -128,7 +128,7 @@ static void init(void)
gPropFd = connectToServer(SYSTEM_PROPERTY_PIPE_NAME);
if (gPropFd < 0) {
//LOGW("not connected to system property server\n");
//ALOGW("not connected to system property server\n");
} else {
//ALOGV("Connected to system property server\n");
}

2
libnetutils/ifc_utils.c
View file

@ -47,7 +47,7 @@
#include <stdio.h>
#include <string.h>
#define ALOGD printf
#define LOGW printf
#define ALOGW printf
#endif
static int ifc_ctl_sock = -1;

6
libnetutils/packet.c
View file

@ -32,7 +32,7 @@
#include <stdio.h>
#include <string.h>
#define ALOGD printf
#define LOGW printf
#define ALOGW printf
#endif
#include "dhcpmsg.h"
@ -209,7 +209,7 @@ int receive_packet(int s, struct dhcp_msg *msg)
/* validate IP header checksum */
sum = finish_sum(checksum(&packet.ip, sizeof(packet.ip), 0));
if (sum != 0) {
LOGW("IP header checksum failure (0x%x)", packet.ip.check);
ALOGW("IP header checksum failure (0x%x)", packet.ip.check);
return -1;
}
/*
@ -231,7 +231,7 @@ int receive_packet(int s, struct dhcp_msg *msg)
sum = finish_sum(checksum(&packet, nread, 0));
packet.udp.check = temp;
if (temp != sum) {
LOGW("UDP header checksum failure (0x%x should be 0x%x)", sum, temp);
ALOGW("UDP header checksum failure (0x%x should be 0x%x)", sum, temp);
return -1;
}
memcpy(msg, &packet.dhcp, dhcp_size);

2
libpixelflinger/scanline.cpp
View file

@ -400,7 +400,7 @@ static void pick_scanline(context_t* c)
c->scanline_as->incStrong(c); // hold on to assembly
c->scanline = (void(*)(context_t* c))assembly->base();
#else
// LOGW("using generic (slow) pixel-pipeline");
// ALOGW("using generic (slow) pixel-pipeline");
c->scanline = scanline;
#endif
}

2
nexus/CommandListener.cpp
View file

@ -213,7 +213,7 @@ int CommandListener::ListCmd::runCommand(SocketClient *cli, int argc, char **arg
if (!NetworkManager::Instance()->getPropMngr()->get((*it),
p_v,
sizeof(p_v))) {
LOGW("Failed to get %s (%s)", (*it), strerror(errno));
ALOGW("Failed to get %s (%s)", (*it), strerror(errno));
}
char *buf;

4
nexus/Controller.cpp
View file

@ -86,7 +86,7 @@ int Controller::unloadKernelModule(const char *modtag) {
}
if (rc != 0) {
LOGW("Unable to unload kernel driver '%s' (%s)", modtag,
ALOGW("Unable to unload kernel driver '%s' (%s)", modtag,
strerror(errno));
}
return rc;
@ -105,7 +105,7 @@ bool Controller::isKernelModuleLoaded(const char *modtag) {
char *endTag = strchr(line, ' ');
if (!endTag) {
LOGW("Unable to find tag for line '%s'", line);
ALOGW("Unable to find tag for line '%s'", line);
continue;
}
if (!strncmp(line, modtag, (endTag - line))) {

2
nexus/DhcpClient.cpp
View file

@ -126,7 +126,7 @@ int DhcpClient::stop() {
close(mListenerSocket);
if (mServiceManager->stop("dhcpcd")) {
LOGW("Failed to stop DHCP service (%s)", strerror(errno));
ALOGW("Failed to stop DHCP service (%s)", strerror(errno));
// XXX: Kill it the hard way.. but its gotta go!
}

2
nexus/DhcpEvent.cpp
View file

@ -50,7 +50,7 @@ int DhcpEvent::parseString(const char *buffer) {
else if (!strcasecmp(buffer, "TIMEOUT"))
return DhcpEvent::TIMEOUT;
else {
LOGW("Bad event '%s'", buffer);
ALOGW("Bad event '%s'", buffer);
return -1;
}
}

20
nexus/DhcpListener.cpp
View file

@ -42,7 +42,7 @@ bool DhcpListener::onDataAvailable(SocketClient *cli) {
int rc;
if ((rc = read(cli->getSocket(), buffer, sizeof(buffer))) < 0) {
LOGW("Error reading dhcp status msg (%s)", strerror(errno));
ALOGW("Error reading dhcp status msg (%s)", strerror(errno));
return true;
}
@ -53,7 +53,7 @@ bool DhcpListener::onDataAvailable(SocketClient *cli) {
for (i = 0; i < 2; i++) {
if (!(tmp = strsep(&next, ":"))) {
LOGW("Error parsing state '%s'", buffer);
ALOGW("Error parsing state '%s'", buffer);
return true;
}
}
@ -65,22 +65,22 @@ bool DhcpListener::onDataAvailable(SocketClient *cli) {
struct in_addr ipaddr, netmask, gateway, broadcast, dns1, dns2;
if (!inet_aton(strsep(&next, ":"), &ipaddr)) {
LOGW("Malformatted IP specified");
ALOGW("Malformatted IP specified");
}
if (!inet_aton(strsep(&next, ":"), &netmask)) {
LOGW("Malformatted netmask specified");
ALOGW("Malformatted netmask specified");
}
if (!inet_aton(strsep(&next, ":"), &broadcast)) {
LOGW("Malformatted broadcast specified");
ALOGW("Malformatted broadcast specified");
}
if (!inet_aton(strsep(&next, ":"), &gateway)) {
LOGW("Malformatted gateway specified");
ALOGW("Malformatted gateway specified");
}
if (!inet_aton(strsep(&next, ":"), &dns1)) {
LOGW("Malformatted dns1 specified");
ALOGW("Malformatted dns1 specified");
}
if (!inet_aton(strsep(&next, ":"), &dns2)) {
LOGW("Malformatted dns2 specified");
ALOGW("Malformatted dns2 specified");
}
mHandlers->onDhcpLeaseUpdated(mController, &ipaddr, &netmask,
&broadcast, &gateway, &dns1, &dns2);
@ -92,7 +92,7 @@ bool DhcpListener::onDataAvailable(SocketClient *cli) {
for (i = 0; i < 2; i++) {
if (!(tmp = strsep(&next, ":"))) {
LOGW("Error parsing event '%s'", buffer);
ALOGW("Error parsing event '%s'", buffer);
return true;
}
}
@ -101,7 +101,7 @@ bool DhcpListener::onDataAvailable(SocketClient *cli) {
mHandlers->onDhcpEvent(mController, ev);
} else {
LOGW("Unknown DHCP monitor msg '%s'", buffer);
ALOGW("Unknown DHCP monitor msg '%s'", buffer);
}
return true;

2
nexus/DhcpState.cpp
View file

@ -74,7 +74,7 @@ int DhcpState::parseString(const char *buffer) {
else if (!strcasecmp(buffer, "ANNOUNCING"))
return DhcpState::ANNOUNCING;
else {
LOGW("Bad state '%s'", buffer);
ALOGW("Bad state '%s'", buffer);
return -1;
}
}

2
nexus/NetworkManager.cpp
View file

@ -49,7 +49,7 @@ NetworkManager::~NetworkManager() {
int NetworkManager::run() {
if (startControllers()) {
LOGW("Unable to start all controllers (%s)", strerror(errno));
ALOGW("Unable to start all controllers (%s)", strerror(errno));
}
return 0;
}

14
nexus/Property.cpp
View file

@ -30,7 +30,7 @@ Property::Property(const char *name, bool readOnly,
mName(name), mReadOnly(readOnly), mType(type),
mNumElements(numElements) {
if (index(name, '.')) {
LOGW("Property name %s violates namespace rules", name);
ALOGW("Property name %s violates namespace rules", name);
}
}
@ -67,7 +67,7 @@ StringPropertyHelper::StringPropertyHelper(const char *name, bool ro,
int StringPropertyHelper::set(int idx, const char *value) {
if (idx != 0) {
LOGW("Attempt to use array index on StringPropertyHelper::set");
ALOGW("Attempt to use array index on StringPropertyHelper::set");
errno = EINVAL;
return -1;
}
@ -77,7 +77,7 @@ int StringPropertyHelper::set(int idx, const char *value) {
int StringPropertyHelper::get(int idx, char *buffer, size_t max) {
if (idx != 0) {
LOGW("Attempt to use array index on StringPropertyHelper::get");
ALOGW("Attempt to use array index on StringPropertyHelper::get");
errno = EINVAL;
return -1;
}
@ -118,7 +118,7 @@ IntegerPropertyHelper::IntegerPropertyHelper(const char *name, bool ro,
int IntegerPropertyHelper::set(int idx, int value) {
if (idx != 0) {
LOGW("Attempt to use array index on IntegerPropertyHelper::set");
ALOGW("Attempt to use array index on IntegerPropertyHelper::set");
errno = EINVAL;
return -1;
}
@ -128,7 +128,7 @@ int IntegerPropertyHelper::set(int idx, int value) {
int IntegerPropertyHelper::get(int idx, int *buffer) {
if (idx != 0) {
LOGW("Attempt to use array index on IntegerPropertyHelper::get");
ALOGW("Attempt to use array index on IntegerPropertyHelper::get");
errno = EINVAL;
return -1;
}
@ -169,7 +169,7 @@ IPV4AddressPropertyHelper::IPV4AddressPropertyHelper(const char *name, bool ro,
int IPV4AddressPropertyHelper::set(int idx, struct in_addr *value) {
if (idx != 0) {
LOGW("Attempt to use array index on IPV4AddressPropertyHelper::set");
ALOGW("Attempt to use array index on IPV4AddressPropertyHelper::set");
errno = EINVAL;
return -1;
}
@ -179,7 +179,7 @@ int IPV4AddressPropertyHelper::set(int idx, struct in_addr *value) {
int IPV4AddressPropertyHelper::get(int idx, struct in_addr *buffer) {
if (idx != 0) {
LOGW("Attempt to use array index on IPV4AddressPropertyHelper::get");
ALOGW("Attempt to use array index on IPV4AddressPropertyHelper::get");
errno = EINVAL;
return -1;
}

6
nexus/PropertyManager.cpp
View file

@ -157,7 +157,7 @@ int PropertyManager::doGet(Property *p, int idx, char *buffer, size_t max) {
if (p->getType() == Property::Type_STRING) {
if (p->get(idx, buffer, max)) {
LOGW("String property %s get failed (%s)", p->getName(),
ALOGW("String property %s get failed (%s)", p->getName(),
strerror(errno));
return -1;
}
@ -165,7 +165,7 @@ int PropertyManager::doGet(Property *p, int idx, char *buffer, size_t max) {
else if (p->getType() == Property::Type_INTEGER) {
int tmp;
if (p->get(idx, &tmp)) {
LOGW("Integer property %s get failed (%s)", p->getName(),
ALOGW("Integer property %s get failed (%s)", p->getName(),
strerror(errno));
return -1;
}
@ -173,7 +173,7 @@ int PropertyManager::doGet(Property *p, int idx, char *buffer, size_t max) {
} else if (p->getType() == Property::Type_IPV4) {
struct in_addr tmp;
if (p->get(idx, &tmp)) {
LOGW("IPV4 property %s get failed (%s)", p->getName(),
ALOGW("IPV4 property %s get failed (%s)", p->getName(),
strerror(errno));
return -1;
}

2
nexus/ScanResult.cpp
View file

@ -74,7 +74,7 @@ ScanResult::ScanResult(char *rawResult) {
return;
out_bad:
LOGW("Malformatted scan result (%s)", rawResult);
ALOGW("Malformatted scan result (%s)", rawResult);
}
ScanResult::~ScanResult() {

26
nexus/Supplicant.cpp
View file

@ -64,7 +64,7 @@ Supplicant::~Supplicant() {
int Supplicant::start() {
if (setupConfig()) {
LOGW("Unable to setup supplicant.conf");
ALOGW("Unable to setup supplicant.conf");
}
if (mServiceManager->start(SUPPLICANT_SERVICE_NAME)) {
@ -89,12 +89,12 @@ int Supplicant::start() {
int Supplicant::stop() {
if (mListener->stopListener()) {
LOGW("Unable to stop supplicant listener (%s)", strerror(errno));
ALOGW("Unable to stop supplicant listener (%s)", strerror(errno));
return -1;
}
if (mServiceManager->stop(SUPPLICANT_SERVICE_NAME)) {
LOGW("Error stopping supplicant (%s)", strerror(errno));
ALOGW("Error stopping supplicant (%s)", strerror(errno));
}
if (mCtrl) {
@ -178,7 +178,7 @@ int Supplicant::refreshNetworkList() {
char *linep_next = NULL;
if (!strtok_r(reply, "\n", &linep_next)) {
LOGW("Malformatted network list\n");
ALOGW("Malformatted network list\n");
free(reply);
errno = EIO;
return -1;
@ -199,7 +199,7 @@ int Supplicant::refreshNetworkList() {
if ((merge_wn = this->lookupNetwork_UNLOCKED(new_wn->getNetworkId()))) {
num_refreshed++;
if (merge_wn->refresh()) {
LOGW("Error refreshing network %d (%s)",
ALOGW("Error refreshing network %d (%s)",
merge_wn->getNetworkId(), strerror(errno));
}
delete new_wn;
@ -210,7 +210,7 @@ int Supplicant::refreshNetworkList() {
new_wn->attachProperties(pm, new_ns);
mNetworks->push_back(new_wn);
if (new_wn->refresh()) {
LOGW("Unable to refresh network id %d (%s)",
ALOGW("Unable to refresh network id %d (%s)",
new_wn->getNetworkId(), strerror(errno));
}
}
@ -243,7 +243,7 @@ int Supplicant::refreshNetworkList() {
int Supplicant::connectToSupplicant() {
if (!isStarted())
LOGW("Supplicant service not running");
ALOGW("Supplicant service not running");
mCtrl = wpa_ctrl_open("tiwlan0"); // XXX:
if (mCtrl == NULL) {
@ -280,7 +280,7 @@ int Supplicant::setScanMode(bool active) {
if (sendCommand((active ? "DRIVER SCAN-ACTIVE" : "DRIVER SCAN-PASSIVE"),
reply, &len)) {
LOGW("triggerScan(%d): Error setting scan mode (%s)", active,
ALOGW("triggerScan(%d): Error setting scan mode (%s)", active,
strerror(errno));
return -1;
}
@ -292,7 +292,7 @@ int Supplicant::triggerScan() {
size_t len = sizeof(reply);
if (sendCommand("SCAN", reply, &len)) {
LOGW("triggerScan(): Error initiating scan");
ALOGW("triggerScan(): Error initiating scan");
return -1;
}
return 0;
@ -303,7 +303,7 @@ int Supplicant::getRssi(int *buffer) {
size_t len = sizeof(reply);
if (sendCommand("DRIVER RSSI", reply, &len)) {
LOGW("Failed to get RSSI (%s)", strerror(errno));
ALOGW("Failed to get RSSI (%s)", strerror(errno));
return -1;
}
@ -325,7 +325,7 @@ int Supplicant::getLinkSpeed() {
size_t len = sizeof(reply);
if (sendCommand("DRIVER LINKSPEED", reply, &len)) {
LOGW("Failed to get LINKSPEED (%s)", strerror(errno));
ALOGW("Failed to get LINKSPEED (%s)", strerror(errno));
return -1;
}
@ -353,7 +353,7 @@ int Supplicant::stopDriver() {
ALOGD("stopDriver()");
if (sendCommand("DRIVER STOP", reply, &len)) {
LOGW("Failed to stop driver (%s)", strerror(errno));
ALOGW("Failed to stop driver (%s)", strerror(errno));
return -1;
}
return 0;
@ -365,7 +365,7 @@ int Supplicant::startDriver() {
ALOGD("startDriver()");
if (sendCommand("DRIVER START", reply, &len)) {
LOGW("Failed to start driver (%s)", strerror(errno));
ALOGW("Failed to start driver (%s)", strerror(errno));
return -1;
}
return 0;

4
nexus/SupplicantEventFactory.cpp
View file

@ -57,9 +57,9 @@ SupplicantEvent *SupplicantEventFactory::createEvent(char *event, size_t len) {
level = atoi(tmp);
event += (match - event) + 1;
} else
LOGW("Unclosed level brace in event");
ALOGW("Unclosed level brace in event");
} else
LOGW("No level specified in event");
ALOGW("No level specified in event");
/*
* <N>CTRL-EVENT-XXX

4
nexus/SupplicantListener.cpp
View file

@ -63,7 +63,7 @@ bool SupplicantListener::onDataAvailable(SocketClient *cli) {
SupplicantEvent *evt = mFactory->createEvent(buf, nread);
if (!evt) {
LOGW("Dropping unknown supplicant event '%s'", buf);
ALOGW("Dropping unknown supplicant event '%s'", buf);
return true;
}
@ -83,7 +83,7 @@ bool SupplicantListener::onDataAvailable(SocketClient *cli) {
else if (evt->getType() == SupplicantEvent::EVENT_DISCONNECTED)
mHandlers->onDisconnectedEvent((SupplicantDisconnectedEvent *) evt);
else
LOGW("Whoops - no handler available for event '%s'\n", buf);
ALOGW("Whoops - no handler available for event '%s'\n", buf);
#if 0
else if (evt->getType() == SupplicantEvent::EVENT_TERMINATING)
mHandlers->onTerminatingEvent(evt);

2
nexus/SupplicantStateChangeEvent.cpp
View file

@ -28,7 +28,7 @@ SupplicantStateChangeEvent::SupplicantStateChangeEvent(int level, char *event,
// XXX: move this stuff into a static creation method
char *p = index(event, ' ');
if (!p) {
LOGW("Bad event '%s'\n", event);
ALOGW("Bad event '%s'\n", event);
return;
}

4
nexus/TiwlanEventListener.cpp
View file

@ -47,9 +47,9 @@ bool TiwlanEventListener::onDataAvailable(SocketClient *cli) {
*spd /= 2;
// ALOGD("Link speed = %u MB/s", *spd);
} else if (data->event_type == IPC_EVENT_LOW_SNR) {
LOGW("Low signal/noise ratio");
ALOGW("Low signal/noise ratio");
} else if (data->event_type == IPC_EVENT_LOW_RSSI) {
LOGW("Low RSSI");
ALOGW("Low RSSI");
} else {
// ALOGD("Dropping unhandled driver event %d", data->event_type);
}

2
nexus/TiwlanWifiController.cpp
View file

@ -78,7 +78,7 @@ int TiwlanWifiController::loadFirmware() {
ALOGD("Firmware loaded OK");
if (startDriverEventListener()) {
LOGW("Failed to start driver event listener (%s)",
ALOGW("Failed to start driver event listener (%s)",
strerror(errno));
}

18
nexus/WifiController.cpp
View file

@ -149,9 +149,9 @@ int WifiController::enable() {
}
if (mSupplicant->refreshNetworkList())
LOGW("Error getting list of networks (%s)", strerror(errno));
ALOGW("Error getting list of networks (%s)", strerror(errno));
LOGW("TODO: Set # of allowed regulatory channels!");
ALOGW("TODO: Set # of allowed regulatory channels!");
mPropMngr->attachProperty("wifi", mDynamicProperties.propSupplicantState);
mPropMngr->attachProperty("wifi", mDynamicProperties.propActiveScan);
@ -195,7 +195,7 @@ int WifiController::setSuspend(bool suspend) {
pthread_mutex_lock(&mLock);
if (suspend == mSuspended) {
LOGW("Suspended state already = %d", suspend);
ALOGW("Suspended state already = %d", suspend);
pthread_mutex_unlock(&mLock);
return 0;
}
@ -212,7 +212,7 @@ int WifiController::setSuspend(bool suspend) {
if (mSupplicantState != SupplicantState::IDLE) {
ALOGD("Forcing Supplicant disconnect");
if (mSupplicant->disconnect()) {
LOGW("Error disconnecting (%s)", strerror(errno));
ALOGW("Error disconnecting (%s)", strerror(errno));
}
}
@ -273,7 +273,7 @@ int WifiController::disable() {
return -1;
}
} else
LOGW("disable(): Supplicant not running?");
ALOGW("disable(): Supplicant not running?");
if (mModuleName[0] != '\0' && isKernelModuleLoaded(mModuleName)) {
sendStatusBroadcast("Unloading WiFi driver");
@ -444,20 +444,20 @@ void WifiController::onConnectedEvent(SupplicantConnectedEvent *evt) {
if (ss->getWpaState() != SupplicantState::COMPLETED) {
char tmp[32];
LOGW("onConnected() with SupplicantState = %s!",
ALOGW("onConnected() with SupplicantState = %s!",
SupplicantState::toString(ss->getWpaState(), tmp,
sizeof(tmp)));
return;
}
if (ss->getId() == -1) {
LOGW("onConnected() with id = -1!");
ALOGW("onConnected() with id = -1!");
return;
}
mCurrentlyConnectedNetworkId = ss->getId();
if (!(wn = mSupplicant->lookupNetwork(ss->getId()))) {
LOGW("Error looking up connected network id %d (%s)",
ALOGW("Error looking up connected network id %d (%s)",
ss->getId(), strerror(errno));
return;
}
@ -481,7 +481,7 @@ void WifiController::onScanResultsEvent(SupplicantScanResultsEvent *evt) {
size_t len = 4096;
if (mSupplicant->sendCommand("SCAN_RESULTS", reply, &len)) {
LOGW("onScanResultsEvent: Error getting scan results (%s)",
ALOGW("onScanResultsEvent: Error getting scan results (%s)",
strerror(errno));
free(reply);
return;

16
nexus/WifiNetwork.cpp
View file

@ -77,7 +77,7 @@ WifiNetwork::WifiNetwork(WifiController *c, Supplicant *suppl, const char *data)
if (!strcmp(flags, "[DISABLED]"))
mEnabled = false;
else
LOGW("Unsupported flags '%s'", flags);
ALOGW("Unsupported flags '%s'", flags);
}
free(tmp);
@ -526,13 +526,13 @@ int WifiNetwork::parseKeyManagementMask(const char *buffer, uint32_t *mask) {
else if (!strcasecmp(v_token, "IEEE8021X"))
*mask |= KeyManagementMask::IEEE8021X;
else {
LOGW("Invalid KeyManagementMask value '%s'", v_token);
ALOGW("Invalid KeyManagementMask value '%s'", v_token);
errno = EINVAL;
free(v_tmp);
return -1;
}
} else {
LOGW("KeyManagementMask value '%s' when NONE", v_token);
ALOGW("KeyManagementMask value '%s' when NONE", v_token);
errno = EINVAL;
free(v_tmp);
return -1;
@ -556,7 +556,7 @@ int WifiNetwork::parseProtocolsMask(const char *buffer, uint32_t *mask) {
else if (!strcasecmp(v_token, "RSN"))
*mask |= SecurityProtocolMask::RSN;
else {
LOGW("Invalid ProtocolsMask value '%s'", v_token);
ALOGW("Invalid ProtocolsMask value '%s'", v_token);
errno = EINVAL;
free(v_tmp);
return -1;
@ -587,7 +587,7 @@ int WifiNetwork::parseAuthAlgorithmsMask(const char *buffer, uint32_t *mask) {
else if (!strcasecmp(v_token, "LEAP"))
*mask |= AuthenticationAlgorithmMask::LEAP;
else {
LOGW("Invalid AuthAlgorithmsMask value '%s'", v_token);
ALOGW("Invalid AuthAlgorithmsMask value '%s'", v_token);
errno = EINVAL;
free(v_tmp);
return -1;
@ -616,13 +616,13 @@ int WifiNetwork::parsePairwiseCiphersMask(const char *buffer, uint32_t *mask) {
else if (!strcasecmp(v_token, "CCMP"))
*mask |= PairwiseCiphersMask::CCMP;
else {
LOGW("PairwiseCiphersMask value '%s' when NONE", v_token);
ALOGW("PairwiseCiphersMask value '%s' when NONE", v_token);
errno = EINVAL;
free(v_tmp);
return -1;
}
} else {
LOGW("Invalid PairwiseCiphersMask value '%s'", v_token);
ALOGW("Invalid PairwiseCiphersMask value '%s'", v_token);
errno = EINVAL;
free(v_tmp);
return -1;
@ -651,7 +651,7 @@ int WifiNetwork::parseGroupCiphersMask(const char *buffer, uint32_t *mask) {
else if (!strcasecmp(v_token, "CCMP"))
*mask |= GroupCiphersMask::CCMP;
else {
LOGW("Invalid GroupCiphersMask value '%s'", v_token);
ALOGW("Invalid GroupCiphersMask value '%s'", v_token);
errno = EINVAL;
free(v_tmp);
return -1;

2
nexus/WifiScanner.cpp
View file

@ -88,7 +88,7 @@ void WifiScanner::run() {
FD_SET(mCtrlPipe[0], &read_fds);
if (mSuppl->triggerScan(mActive)) {
LOGW("Error triggering scan (%s)", strerror(errno));
ALOGW("Error triggering scan (%s)", strerror(errno));
}
if ((rc = select(mCtrlPipe[0] + 1, &read_fds, NULL, NULL, &to)) < 0) {