Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

quick style cleanup; no functional change

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40395 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alexander von Gluck IV 2011-02-08 21:06:34 +00:00
parent 8b94d2ff6a
commit e9aa1e0581
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/tests/kits/net/preflet/InterfacesAddOn/InterfacesListView.cpp
View File

@ -93,9 +93,7 @@ InterfaceListItem::Update(BView* owner, const BFont* font)
void
InterfaceListItem::DrawItem(BView* owner, BRect /*bounds*/, bool complete)
{
BListView* list = dynamic_cast<BListView*>(owner);
BBitmap* stateIcon(NULL);
BString interfaceState;
BListView* list = dynamic_cast<BListView*>(owner);
BNetworkAddress addrIPv4 = fSettings->GetAddr(AF_INET);
BNetworkAddress addrIPv6 = fSettings->GetAddr(AF_INET6);
@ -120,6 +118,9 @@ InterfaceListItem::DrawItem(BView* owner, BRect /*bounds*/, bool complete)
list->FillRect(bounds);
}
BString interfaceState;
BBitmap* stateIcon(NULL);
if (fSettings->IsDisabled()) {
interfaceState << "disabled";
stateIcon = fIconOffline;
@ -206,7 +207,7 @@ InterfaceListItem::_Init()
{
fSettings = new NetworkSettings(Name());
const char* mediaTypeName = NULL;
const char* mediaTypeName = NULL;
int media = fInterface.Media();
@ -236,12 +237,12 @@ InterfaceListItem::_Init()
void
InterfaceListItem::_PopulateBitmaps(const char* mediaType) {
const uint8* interfaceHVIF;
const uint8* offlineHVIF;
const uint8* pendingHVIF;
const uint8* onlineHVIF;
const uint8* interfaceHVIF;
const uint8* offlineHVIF;
const uint8* pendingHVIF;
const uint8* onlineHVIF;
BBitmap* interfaceBitmap = NULL;
BBitmap* interfaceBitmap = NULL;
/* Load interface icons */
image_info info;

41
src/tests/kits/net/preflet/InterfacesAddOn/NetworkSettings.cpp
View File

@ -74,39 +74,38 @@ NetworkSettings::_PrepareRequest(struct ifreq& request)
void
NetworkSettings::ReadConfiguration()
{
ifreq ifReq;
sockaddr_in* inetAddress = NULL;
ifreq request;
if (!_PrepareRequest(ifReq))
if (!_PrepareRequest(request))
return;
// Obtain IPv4 address.
if (ioctl(fSocket4, SIOCGIFADDR, &ifReq, sizeof(ifReq)) < 0)
if (ioctl(fSocket4, SIOCGIFADDR, &request, sizeof(request)) < 0)
return;
fIPv4Addr = *((sockaddr_in *)(&(ifReq.ifr_addr)));
fIPv4Addr = *(sockaddr_in *)&request.ifr_addr;
// Obtain IPv4 netmask
if (ioctl(fSocket4, SIOCGIFNETMASK, &ifReq, sizeof(ifReq)) < 0)
if (ioctl(fSocket4, SIOCGIFNETMASK, &request, sizeof(request)) < 0)
return;
fIPv4Mask = *((sockaddr_in *)(&(ifReq.ifr_mask)));
fIPv4Mask = *(sockaddr_in *)&request.ifr_mask;
// Obtain IPv6 address.
if (ioctl(fSocket6, SIOCGIFADDR, &ifReq, sizeof(ifReq)) < 0)
if (ioctl(fSocket6, SIOCGIFADDR, &request, sizeof(request)) < 0)
return;
fIPv6Addr = *((sockaddr_in6 *)(&(ifReq.ifr_addr)));
fIPv6Addr = *(sockaddr_in6 *)&request.ifr_addr;
// Obtain IPv6 netmask
if (ioctl(fSocket6, SIOCGIFNETMASK, &ifReq, sizeof(ifReq)) < 0)
if (ioctl(fSocket6, SIOCGIFNETMASK, &request, sizeof(request)) < 0)
return;
fIPv6Mask = *((sockaddr_in6 *)(&(ifReq.ifr_mask)));
fIPv6Mask = *(sockaddr_in6 *)&request.ifr_mask;
// Obtain gateway
ifconf ifCfg;
ifCfg.ifc_len = sizeof(ifCfg.ifc_value);
if (ioctl(fSocket4, SIOCGRTSIZE, &ifCfg, sizeof(ifCfg)) < 0)
ifconf config;
config.ifc_len = sizeof(config.ifc_value);
if (ioctl(fSocket4, SIOCGRTSIZE, &config, sizeof(config)) < 0)
return;
uint32 size = (uint32)ifCfg.ifc_value;
uint32 size = (uint32)config.ifc_value;
if (size == 0)
return;
@ -115,10 +114,10 @@ NetworkSettings::ReadConfiguration()
return;
MemoryDeleter bufferDeleter(buffer);
ifCfg.ifc_len = size;
ifCfg.ifc_buf = buffer;
config.ifc_len = size;
config.ifc_buf = buffer;
if (ioctl(fSocket4, SIOCGRTTABLE, &ifCfg, sizeof(ifCfg)) < 0)
if (ioctl(fSocket4, SIOCGRTTABLE, &config, sizeof(config)) < 0)
return;
ifreq* interface = (ifreq*)buffer;
@ -128,7 +127,7 @@ NetworkSettings::ReadConfiguration()
route_entry& route = interface->ifr_route;
if ((route.flags & RTF_GATEWAY) != 0) {
inetAddress = (sockaddr_in*)route.gateway;
sockaddr_in* inetAddress = (sockaddr_in*)route.gateway;
fGateway = inet_ntoa(inetAddress->sin_addr);
}
@ -145,8 +144,8 @@ NetworkSettings::ReadConfiguration()
}
uint32 flags = 0;
if (ioctl(fSocket4, SIOCGIFFLAGS, &ifReq, sizeof(ifReq)) == 0)
flags = ifReq.ifr_flags;
if (ioctl(fSocket4, SIOCGIFFLAGS, &request, sizeof(request)) == 0)
flags = request.ifr_flags;
fAuto = (flags & (IFF_AUTO_CONFIGURED | IFF_CONFIGURING)) != 0;
fDisabled = (flags & IFF_UP) == 0;