summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2010-11-25 23:06:10 +0100
committerMichael Meeks <michael.meeks@novell.com>2010-11-26 10:12:19 +0000
commit21d5d30f035560df07b49139587479c969e0437b (patch)
tree75fb7ef43f7c6e6e35457da31d238bd0932d0b05 /sal
parent90ce30a134830fc3afeac0c108a3606227a22bbd (diff)
unused variables in ./sal/osl/unx/util.c
Hello, Here is a small patch for ./sal/osl/unx/util.c Julien. commit 9b18a955cd7ac4462c68b8113f73cd4dca2ccbbb Author: serval <serval@ilapharm.com> Date: Thu Nov 25 23:03:04 2010 +0100 ure : remove unused variables
Diffstat (limited to 'sal')
-rw-r--r--sal/osl/unx/util.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/sal/osl/unx/util.c b/sal/osl/unx/util.c
index c687e6ce7e76..ae642d922f0e 100644
--- a/sal/osl/unx/util.c
+++ b/sal/osl/unx/util.c
@@ -57,12 +57,7 @@ static int osl_checkAddr(const char* addr);
sal_Bool SAL_CALL osl_getEthernetAddress( sal_uInt8 * pAddr )
{
- char buff[1024];
- char hard_addr[64];
struct ifconf ifc;
- struct ifreq *ifr;
- int i;
- int so;
#ifdef SOLARIS
/** algorithm doesn't work on solaris */
@@ -92,7 +87,7 @@ sal_Bool SAL_CALL osl_getEthernetAddress( sal_uInt8 * pAddr )
ifc.ifc_buf = buff;
if ( ioctl(so, SIOCGIFCONF, &ifc) < 0 )
{
-/* fprintf(stderr, "SIOCGIFCONF: %s\n", strerror(errno));*/
+ OSL_TRACE( "SIOCGIFCONF: %s\n", strerror(errno) );
close(so);
return sal_False;
}
@@ -141,7 +136,7 @@ static int osl_getHWAddr(const char *ifname, char* hard_addr)
if ( ret < 0 )
{
-/* fprintf(stderr, "SIOCGIFFLAGS: %s\n", strerror(errno)); */
+ OSL_TRACE( "SIOCGIFFLAGS: %s\n", strerror(errno) );
close(so);
return ret;
}
@@ -153,7 +148,7 @@ static int osl_getHWAddr(const char *ifname, char* hard_addr)
if (ifr.ifr_flags & IFF_LOOPBACK)
{
-/* fprintf(stderr, "SIOCGIFFLAGS : is LOOPBACK : %s\n", strerror(errno));*/
+ OSL_TRACE( "SIOCGIFFLAGS : is LOOPBACK : %s\n", strerror(errno) );
close(so);
return 0;
}
@@ -170,7 +165,7 @@ static int osl_getHWAddr(const char *ifname, char* hard_addr)
#endif
if (ret < 0) {
-/* fprintf(stderr, "SIOCGIFADDR: %s\n", strerror(errno));*/
+ OSL_TRACE( "SIOCGIFADDR: %s\n", strerror(errno) );
memset(hard_addr, 0, 32);
close(so);
return ret;
@@ -193,12 +188,11 @@ static int osl_getHWAddr(const char *ifname, char* hard_addr)
ret=osl_checkAddr(hard_addr);
if (ret < 0) {
-/* fprintf(stderr, "SIOCGIFADDR got '00:00:00:00:00:00'\n"); */
+ OSL_TRACE( "SIOCGIFADDR got '00:00:00:00:00:00'\n" );
return ret;
}
-/* fprintf(stderr,"interface : %s -- ",ifname);*/
-/* fprintf(stderr,"HWaddr : %s\n", print_ether(hard_addr));*/
+ OSL_TRACE( "interface: %s -- HWaddr : %s\n", ifname, print_ether(hard_addr) );
return 1;
}