gecko-dev/netwerk/wifi/nsWifiAccessPoint.cpp
Eric Rahm 75c4bebb79 Bug 1165515 - Part 13-2: Replace usage of PRLogModuleLevel and PR_LOG_*. rs=froydnj
This is straightforward mapping of PR_LOG levels to their LogLevel
counterparts:
  PR_LOG_ERROR   -> LogLevel::Error
  PR_LOG_WARNING -> LogLevel::Warning
  PR_LOG_WARN    -> LogLevel::Warning
  PR_LOG_INFO    -> LogLevel::Info
  PR_LOG_DEBUG   -> LogLevel::Debug
  PR_LOG_NOTICE  -> LogLevel::Debug
  PR_LOG_VERBOSE -> LogLevel::Verbose

Instances of PRLogModuleLevel were mapped to a fully qualified
mozilla::LogLevel, instances of PR_LOG levels in #defines were mapped to a
fully qualified mozilla::LogLevel::* level, and all other instances were
mapped to us a shorter format of LogLevel::*.

Bustage for usage of the non-fully qualified LogLevel were fixed by adding
|using mozilla::LogLevel;| where appropriate.
2015-06-03 15:25:57 -07:00

97 lines
2.2 KiB
C++

/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsWifiAccessPoint.h"
#include "nsString.h"
#include "nsMemory.h"
#include "mozilla/Logging.h"
extern PRLogModuleInfo *gWifiMonitorLog;
#define LOG(args) MOZ_LOG(gWifiMonitorLog, mozilla::LogLevel::Debug, args)
NS_IMPL_ISUPPORTS(nsWifiAccessPoint, nsIWifiAccessPoint)
nsWifiAccessPoint::nsWifiAccessPoint()
{
// make sure these are null terminated (because we are paranoid)
mMac[0] = '\0';
mSsid[0] = '\0';
mSsidLen = 0;
mSignal = -1000;
}
nsWifiAccessPoint::~nsWifiAccessPoint()
{
}
NS_IMETHODIMP nsWifiAccessPoint::GetMac(nsACString& aMac)
{
aMac.Assign(mMac);
return NS_OK;
}
NS_IMETHODIMP nsWifiAccessPoint::GetSsid(nsAString& aSsid)
{
// just assign and embedded nulls will truncate resulting
// in a displayable string.
CopyASCIItoUTF16(mSsid, aSsid);
return NS_OK;
}
NS_IMETHODIMP nsWifiAccessPoint::GetRawSSID(nsACString& aRawSsid)
{
aRawSsid.Assign(mSsid, mSsidLen); // SSIDs are 32 chars long
return NS_OK;
}
NS_IMETHODIMP nsWifiAccessPoint::GetSignal(int32_t *aSignal)
{
NS_ENSURE_ARG(aSignal);
*aSignal = mSignal;
return NS_OK;
}
// Helper functions:
bool AccessPointsEqual(nsCOMArray<nsWifiAccessPoint>& a, nsCOMArray<nsWifiAccessPoint>& b)
{
if (a.Count() != b.Count()) {
LOG(("AccessPoint lists have different lengths\n"));
return false;
}
for (int32_t i = 0; i < a.Count(); i++) {
LOG(("++ Looking for %s\n", a[i]->mSsid));
bool found = false;
for (int32_t j = 0; j < b.Count(); j++) {
LOG((" %s->%s | %s->%s\n", a[i]->mSsid, b[j]->mSsid, a[i]->mMac, b[j]->mMac));
if (!strcmp(a[i]->mSsid, b[j]->mSsid) &&
!strcmp(a[i]->mMac, b[j]->mMac) &&
a[i]->mSignal == b[j]->mSignal) {
found = true;
}
}
if (!found)
return false;
}
LOG((" match!\n"));
return true;
}
void ReplaceArray(nsCOMArray<nsWifiAccessPoint>& a, nsCOMArray<nsWifiAccessPoint>& b)
{
a.Clear();
// better way to copy?
for (int32_t i = 0; i < b.Count(); i++) {
a.AppendObject(b[i]);
}
b.Clear();
}