i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions 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
Download Patch File Download Diff File Expand all files Collapse all files
src/tests/kits/net/preflet/InterfacesAddOn/InterfacesListView.cpp
+10 -9
View File
@@ -93,9 +93,7 @@ InterfaceListItem::Update(BView* owner, const BFont* font)
void void
InterfaceListItem::DrawItem(BView* owner, BRect /*bounds*/, bool complete) InterfaceListItem::DrawItem(BView* owner, BRect /*bounds*/, bool complete)
{ {
BListView* list = dynamic_cast<BListView*>(owner); BListView* list = dynamic_cast<BListView*>(owner);
BBitmap* stateIcon(NULL);
BString interfaceState;
BNetworkAddress addrIPv4 = fSettings->GetAddr(AF_INET); BNetworkAddress addrIPv4 = fSettings->GetAddr(AF_INET);
BNetworkAddress addrIPv6 = fSettings->GetAddr(AF_INET6); BNetworkAddress addrIPv6 = fSettings->GetAddr(AF_INET6);
@@ -120,6 +118,9 @@ InterfaceListItem::DrawItem(BView* owner, BRect /*bounds*/, bool complete)
list->FillRect(bounds); list->FillRect(bounds);
} }
BString interfaceState;
BBitmap* stateIcon(NULL);
if (fSettings->IsDisabled()) { if (fSettings->IsDisabled()) {
interfaceState << "disabled"; interfaceState << "disabled";
stateIcon = fIconOffline; stateIcon = fIconOffline;
@@ -206,7 +207,7 @@ InterfaceListItem::_Init()
{ {
fSettings = new NetworkSettings(Name()); fSettings = new NetworkSettings(Name());
const char* mediaTypeName = NULL; const char* mediaTypeName = NULL;
int media = fInterface.Media(); int media = fInterface.Media();
@@ -236,12 +237,12 @@ InterfaceListItem::_Init()
void void
InterfaceListItem::_PopulateBitmaps(const char* mediaType) { InterfaceListItem::_PopulateBitmaps(const char* mediaType) {
const uint8* interfaceHVIF; const uint8* interfaceHVIF;
const uint8* offlineHVIF; const uint8* offlineHVIF;
const uint8* pendingHVIF; const uint8* pendingHVIF;
const uint8* onlineHVIF; const uint8* onlineHVIF;
BBitmap* interfaceBitmap = NULL; BBitmap* interfaceBitmap = NULL;
/* Load interface icons */ /* Load interface icons */
image_info info; image_info info;
src/tests/kits/net/preflet/InterfacesAddOn/NetworkSettings.cpp
+20 -21
View File
@@ -74,39 +74,38 @@ NetworkSettings::_PrepareRequest(struct ifreq& request)
void void
NetworkSettings::ReadConfiguration() NetworkSettings::ReadConfiguration()
{ {
ifreq ifReq; ifreq request;
sockaddr_in* inetAddress = NULL;
if (!_PrepareRequest(ifReq)) if (!_PrepareRequest(request))
return; return;
// Obtain IPv4 address. // Obtain IPv4 address.
if (ioctl(fSocket4, SIOCGIFADDR, &ifReq, sizeof(ifReq)) < 0) if (ioctl(fSocket4, SIOCGIFADDR, &request, sizeof(request)) < 0)
return; return;
fIPv4Addr = *((sockaddr_in *)(&(ifReq.ifr_addr))); fIPv4Addr = *(sockaddr_in *)&request.ifr_addr;
// Obtain IPv4 netmask // Obtain IPv4 netmask
if (ioctl(fSocket4, SIOCGIFNETMASK, &ifReq, sizeof(ifReq)) < 0) if (ioctl(fSocket4, SIOCGIFNETMASK, &request, sizeof(request)) < 0)
return; return;
fIPv4Mask = *((sockaddr_in *)(&(ifReq.ifr_mask))); fIPv4Mask = *(sockaddr_in *)&request.ifr_mask;
// Obtain IPv6 address. // Obtain IPv6 address.
if (ioctl(fSocket6, SIOCGIFADDR, &ifReq, sizeof(ifReq)) < 0) if (ioctl(fSocket6, SIOCGIFADDR, &request, sizeof(request)) < 0)
return; return;
fIPv6Addr = *((sockaddr_in6 *)(&(ifReq.ifr_addr))); fIPv6Addr = *(sockaddr_in6 *)&request.ifr_addr;
// Obtain IPv6 netmask // Obtain IPv6 netmask
if (ioctl(fSocket6, SIOCGIFNETMASK, &ifReq, sizeof(ifReq)) < 0) if (ioctl(fSocket6, SIOCGIFNETMASK, &request, sizeof(request)) < 0)
return; return;
fIPv6Mask = *((sockaddr_in6 *)(&(ifReq.ifr_mask))); fIPv6Mask = *(sockaddr_in6 *)&request.ifr_mask;
// Obtain gateway // Obtain gateway
ifconf ifCfg; ifconf config;
ifCfg.ifc_len = sizeof(ifCfg.ifc_value); config.ifc_len = sizeof(config.ifc_value);
if (ioctl(fSocket4, SIOCGRTSIZE, &ifCfg, sizeof(ifCfg)) < 0) if (ioctl(fSocket4, SIOCGRTSIZE, &config, sizeof(config)) < 0)
return; return;
uint32 size = (uint32)ifCfg.ifc_value; uint32 size = (uint32)config.ifc_value;
if (size == 0) if (size == 0)
return; return;
@@ -115,10 +114,10 @@ NetworkSettings::ReadConfiguration()
return; return;
MemoryDeleter bufferDeleter(buffer); MemoryDeleter bufferDeleter(buffer);
ifCfg.ifc_len = size; config.ifc_len = size;
ifCfg.ifc_buf = buffer; config.ifc_buf = buffer;
if (ioctl(fSocket4, SIOCGRTTABLE, &ifCfg, sizeof(ifCfg)) < 0) if (ioctl(fSocket4, SIOCGRTTABLE, &config, sizeof(config)) < 0)
return; return;
ifreq* interface = (ifreq*)buffer; ifreq* interface = (ifreq*)buffer;
@@ -128,7 +127,7 @@ NetworkSettings::ReadConfiguration()
route_entry& route = interface->ifr_route; route_entry& route = interface->ifr_route;
if ((route.flags & RTF_GATEWAY) != 0) { if ((route.flags & RTF_GATEWAY) != 0) {
inetAddress = (sockaddr_in*)route.gateway; sockaddr_in* inetAddress = (sockaddr_in*)route.gateway;
fGateway = inet_ntoa(inetAddress->sin_addr); fGateway = inet_ntoa(inetAddress->sin_addr);
} }
@@ -145,8 +144,8 @@ NetworkSettings::ReadConfiguration()
} }
uint32 flags = 0; uint32 flags = 0;
if (ioctl(fSocket4, SIOCGIFFLAGS, &ifReq, sizeof(ifReq)) == 0) if (ioctl(fSocket4, SIOCGIFFLAGS, &request, sizeof(request)) == 0)
flags = ifReq.ifr_flags; flags = request.ifr_flags;
fAuto = (flags & (IFF_AUTO_CONFIGURED | IFF_CONFIGURING)) != 0; fAuto = (flags & (IFF_AUTO_CONFIGURED | IFF_CONFIGURING)) != 0;
fDisabled = (flags & IFF_UP) == 0; fDisabled = (flags & IFF_UP) == 0;