author | zecke <zecke> | 2004-08-23 22:36:53 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-08-23 22:36:53 (UTC) |
commit | f8f1d4f340b591f21cd7c10259da1241ecf69dd9 (patch) (unidiff) | |
tree | 1dd1f56716000d7952c31340e4b299c5635cbade | |
parent | bf5a6236fe0f0ab42075a6a20539b7fd856ddcdd (diff) | |
download | opie-f8f1d4f340b591f21cd7c10259da1241ecf69dd9.zip opie-f8f1d4f340b591f21cd7c10259da1241ecf69dd9.tar.gz opie-f8f1d4f340b591f21cd7c10259da1241ecf69dd9.tar.bz2 |
Fix warnings raised by the compiler
-rw-r--r-- | libopie2/opienet/onetwork.cpp | 12 | ||||
-rw-r--r-- | libopie2/opienet/opcap.cpp | 23 |
2 files changed, 18 insertions, 17 deletions
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp index 171a2bc..591681c 100644 --- a/libopie2/opienet/onetwork.cpp +++ b/libopie2/opienet/onetwork.cpp | |||
@@ -831,21 +831,21 @@ void OWirelessNetworkInterface::setPrivate( const QString& call, int numargs, .. | |||
831 | } | 831 | } |
832 | va_end( argp ); | 832 | va_end( argp ); |
833 | priv->invoke(); | 833 | priv->invoke(); |
834 | } | 834 | } |
835 | 835 | ||
836 | 836 | ||
837 | void OWirelessNetworkInterface::getPrivate( const QString& call ) | 837 | void OWirelessNetworkInterface::getPrivate( const QString& ) |
838 | { | 838 | { |
839 | oerr << "OWirelessNetworkInterface::getPrivate() is not implemented yet." << oendl; | 839 | oerr << "OWirelessNetworkInterface::getPrivate() is not implemented yet." << oendl; |
840 | } | 840 | } |
841 | 841 | ||
842 | 842 | ||
843 | bool OWirelessNetworkInterface::hasPrivate( const QString& call ) | 843 | bool OWirelessNetworkInterface::hasPrivate( const QString& call ) |
844 | { | 844 | { |
845 | return child( (const char*) call ); | 845 | return child( call.local8Bit() ); |
846 | } | 846 | } |
847 | 847 | ||
848 | 848 | ||
849 | QString OWirelessNetworkInterface::SSID() const | 849 | QString OWirelessNetworkInterface::SSID() const |
850 | { | 850 | { |
851 | char str[IW_ESSID_MAX_SIZE]; | 851 | char str[IW_ESSID_MAX_SIZE]; |
@@ -1009,14 +1009,14 @@ int OWirelessNetworkInterface::signalStrength() const | |||
1009 | { | 1009 | { |
1010 | return -1; | 1010 | return -1; |
1011 | } | 1011 | } |
1012 | 1012 | ||
1013 | int max = _range.max_qual.qual; | 1013 | int max = _range.max_qual.qual; |
1014 | int cur = stat.qual.qual; | 1014 | int cur = stat.qual.qual; |
1015 | int lev = stat.qual.level; //FIXME: Do something with them? | 1015 | // int lev = stat.qual.level; //FIXME: Do something with them? |
1016 | int noi = stat.qual.noise; //FIXME: Do something with them? | 1016 | // int noi = stat.qual.noise; //FIXME: Do something with them? |
1017 | 1017 | ||
1018 | 1018 | ||
1019 | return max != 0 ? cur*100/max: -1; | 1019 | return max != 0 ? cur*100/max: -1; |
1020 | } | 1020 | } |
1021 | 1021 | ||
1022 | 1022 | ||
@@ -1068,13 +1068,13 @@ void OMonitoringInterface::setChannel( int c ) | |||
1068 | _if->_iwr.u.freq.m = c; | 1068 | _if->_iwr.u.freq.m = c; |
1069 | _if->_iwr.u.freq.e = 0; | 1069 | _if->_iwr.u.freq.e = 0; |
1070 | _if->wioctl( SIOCSIWFREQ ); | 1070 | _if->wioctl( SIOCSIWFREQ ); |
1071 | } | 1071 | } |
1072 | 1072 | ||
1073 | 1073 | ||
1074 | void OMonitoringInterface::setEnabled( bool b ) | 1074 | void OMonitoringInterface::setEnabled( bool ) |
1075 | { | 1075 | { |
1076 | } | 1076 | } |
1077 | 1077 | ||
1078 | 1078 | ||
1079 | /*====================================================================================== | 1079 | /*====================================================================================== |
1080 | * OCiscoMonitoringInterface | 1080 | * OCiscoMonitoringInterface |
@@ -1089,13 +1089,13 @@ OCiscoMonitoringInterface::OCiscoMonitoringInterface( ONetworkInterface* iface, | |||
1089 | 1089 | ||
1090 | OCiscoMonitoringInterface::~OCiscoMonitoringInterface() | 1090 | OCiscoMonitoringInterface::~OCiscoMonitoringInterface() |
1091 | { | 1091 | { |
1092 | } | 1092 | } |
1093 | 1093 | ||
1094 | 1094 | ||
1095 | void OCiscoMonitoringInterface::setEnabled( bool b ) | 1095 | void OCiscoMonitoringInterface::setEnabled( bool /*b*/ ) |
1096 | { | 1096 | { |
1097 | QString fname; | 1097 | QString fname; |
1098 | fname.sprintf( "/proc/driver/aironet/%s", (const char*) _if->name() ); | 1098 | fname.sprintf( "/proc/driver/aironet/%s", (const char*) _if->name() ); |
1099 | QFile f( fname ); | 1099 | QFile f( fname ); |
1100 | if ( !f.exists() ) return; | 1100 | if ( !f.exists() ) return; |
1101 | 1101 | ||
diff --git a/libopie2/opienet/opcap.cpp b/libopie2/opienet/opcap.cpp index 03e4502..25ac09b 100644 --- a/libopie2/opienet/opcap.cpp +++ b/libopie2/opienet/opcap.cpp | |||
@@ -187,12 +187,13 @@ int OPacket::len() const | |||
187 | } | 187 | } |
188 | 188 | ||
189 | 189 | ||
190 | QTextStream& operator<<( QTextStream& s, const OPacket& p ) | 190 | QTextStream& operator<<( QTextStream& s, const OPacket& p ) |
191 | { | 191 | { |
192 | s << p.dumpStructure(); | 192 | s << p.dumpStructure(); |
193 | return s; | ||
193 | } | 194 | } |
194 | 195 | ||
195 | 196 | ||
196 | /*====================================================================================== | 197 | /*====================================================================================== |
197 | * OEthernetPacket | 198 | * OEthernetPacket |
198 | *======================================================================================*/ | 199 | *======================================================================================*/ |
@@ -324,13 +325,13 @@ int OIPPacket::checksum() const | |||
324 | 325 | ||
325 | /*====================================================================================== | 326 | /*====================================================================================== |
326 | * OARPPacket | 327 | * OARPPacket |
327 | *======================================================================================*/ | 328 | *======================================================================================*/ |
328 | 329 | ||
329 | 330 | ||
330 | OARPPacket::OARPPacket( const unsigned char* end, const struct myarphdr* data, QObject* parent ) | 331 | OARPPacket::OARPPacket( const unsigned char* /*end*/, const struct myarphdr* data, QObject* parent ) |
331 | :QObject( parent, "ARP" ), _arphdr( data ) | 332 | :QObject( parent, "ARP" ), _arphdr( data ) |
332 | { | 333 | { |
333 | odebug << "OARPPacket::OARPPacket(): decoding ARP header..." << oendl; | 334 | odebug << "OARPPacket::OARPPacket(): decoding ARP header..." << oendl; |
334 | odebug << "ARP type seems to be " << EXTRACT_16BITS( &_arphdr->ar_op ) << " = " << type() << oendl; | 335 | odebug << "ARP type seems to be " << EXTRACT_16BITS( &_arphdr->ar_op ) << " = " << type() << oendl; |
335 | odebug << "Sender: MAC " << senderMacAddress().toString() << " = IP " << senderIPV4Address().toString() << oendl; | 336 | odebug << "Sender: MAC " << senderMacAddress().toString() << " = IP " << senderIPV4Address().toString() << oendl; |
336 | odebug << "Target: MAC " << targetMacAddress().toString() << " = IP " << targetIPV4Address().toString() << oendl; | 337 | odebug << "Target: MAC " << targetMacAddress().toString() << " = IP " << targetIPV4Address().toString() << oendl; |
@@ -544,13 +545,13 @@ OMacAddress ODHCPPacket::clientMacAddress() const | |||
544 | 545 | ||
545 | /*====================================================================================== | 546 | /*====================================================================================== |
546 | * OTCPPacket | 547 | * OTCPPacket |
547 | *======================================================================================*/ | 548 | *======================================================================================*/ |
548 | 549 | ||
549 | 550 | ||
550 | OTCPPacket::OTCPPacket( const unsigned char* end, const struct tcphdr* data, QObject* parent ) | 551 | OTCPPacket::OTCPPacket( const unsigned char* /*end*/, const struct tcphdr* data, QObject* parent ) |
551 | :QObject( parent, "TCP" ), _tcphdr( data ) | 552 | :QObject( parent, "TCP" ), _tcphdr( data ) |
552 | 553 | ||
553 | { | 554 | { |
554 | odebug << "OTCPPacket::OTCPPacket(): decoding TCP header..." << oendl; | 555 | odebug << "OTCPPacket::OTCPPacket(): decoding TCP header..." << oendl; |
555 | } | 556 | } |
556 | 557 | ||
@@ -831,13 +832,13 @@ bool OWaveLanManagementPacket::canPrivacy() const | |||
831 | 832 | ||
832 | 833 | ||
833 | /*====================================================================================== | 834 | /*====================================================================================== |
834 | * OWaveLanManagementSSID | 835 | * OWaveLanManagementSSID |
835 | *======================================================================================*/ | 836 | *======================================================================================*/ |
836 | 837 | ||
837 | OWaveLanManagementSSID::OWaveLanManagementSSID( const unsigned char* end, const struct ssid_t* data, QObject* parent ) | 838 | OWaveLanManagementSSID::OWaveLanManagementSSID( const unsigned char* /*end*/, const struct ssid_t* data, QObject* parent ) |
838 | :QObject( parent, "802.11 SSID" ), _data( data ) | 839 | :QObject( parent, "802.11 SSID" ), _data( data ) |
839 | { | 840 | { |
840 | odebug << "OWaveLanManagementSSID()" << oendl; | 841 | odebug << "OWaveLanManagementSSID()" << oendl; |
841 | } | 842 | } |
842 | 843 | ||
843 | 844 | ||
@@ -867,13 +868,13 @@ QString OWaveLanManagementSSID::ID( bool decloak ) const | |||
867 | 868 | ||
868 | 869 | ||
869 | /*====================================================================================== | 870 | /*====================================================================================== |
870 | * OWaveLanManagementRates | 871 | * OWaveLanManagementRates |
871 | *======================================================================================*/ | 872 | *======================================================================================*/ |
872 | 873 | ||
873 | OWaveLanManagementRates::OWaveLanManagementRates( const unsigned char* end, const struct rates_t* data, QObject* parent ) | 874 | OWaveLanManagementRates::OWaveLanManagementRates( const unsigned char* /*end*/, const struct rates_t* data, QObject* parent ) |
874 | :QObject( parent, "802.11 Rates" ), _data( data ) | 875 | :QObject( parent, "802.11 Rates" ), _data( data ) |
875 | { | 876 | { |
876 | odebug << "OWaveLanManagementRates()" << oendl; | 877 | odebug << "OWaveLanManagementRates()" << oendl; |
877 | } | 878 | } |
878 | 879 | ||
879 | 880 | ||
@@ -882,13 +883,13 @@ OWaveLanManagementRates::~OWaveLanManagementRates() | |||
882 | } | 883 | } |
883 | 884 | ||
884 | /*====================================================================================== | 885 | /*====================================================================================== |
885 | * OWaveLanManagementCF | 886 | * OWaveLanManagementCF |
886 | *======================================================================================*/ | 887 | *======================================================================================*/ |
887 | 888 | ||
888 | OWaveLanManagementCF::OWaveLanManagementCF( const unsigned char* end, const struct cf_t* data, QObject* parent ) | 889 | OWaveLanManagementCF::OWaveLanManagementCF( const unsigned char* /*end*/, const struct cf_t* data, QObject* parent ) |
889 | :QObject( parent, "802.11 CF" ), _data( data ) | 890 | :QObject( parent, "802.11 CF" ), _data( data ) |
890 | { | 891 | { |
891 | odebug << "OWaveLanManagementCF()" << oendl; | 892 | odebug << "OWaveLanManagementCF()" << oendl; |
892 | } | 893 | } |
893 | 894 | ||
894 | 895 | ||
@@ -897,13 +898,13 @@ OWaveLanManagementCF::~OWaveLanManagementCF() | |||
897 | } | 898 | } |
898 | 899 | ||
899 | /*====================================================================================== | 900 | /*====================================================================================== |
900 | * OWaveLanManagementFH | 901 | * OWaveLanManagementFH |
901 | *======================================================================================*/ | 902 | *======================================================================================*/ |
902 | 903 | ||
903 | OWaveLanManagementFH::OWaveLanManagementFH( const unsigned char* end, const struct fh_t* data, QObject* parent ) | 904 | OWaveLanManagementFH::OWaveLanManagementFH( const unsigned char* /*end*/, const struct fh_t* data, QObject* parent ) |
904 | :QObject( parent, "802.11 FH" ), _data( data ) | 905 | :QObject( parent, "802.11 FH" ), _data( data ) |
905 | { | 906 | { |
906 | odebug << "OWaveLanManagementFH()" << oendl; | 907 | odebug << "OWaveLanManagementFH()" << oendl; |
907 | } | 908 | } |
908 | 909 | ||
909 | 910 | ||
@@ -912,13 +913,13 @@ OWaveLanManagementFH::~OWaveLanManagementFH() | |||
912 | } | 913 | } |
913 | 914 | ||
914 | /*====================================================================================== | 915 | /*====================================================================================== |
915 | * OWaveLanManagementDS | 916 | * OWaveLanManagementDS |
916 | *======================================================================================*/ | 917 | *======================================================================================*/ |
917 | 918 | ||
918 | OWaveLanManagementDS::OWaveLanManagementDS( const unsigned char* end, const struct ds_t* data, QObject* parent ) | 919 | OWaveLanManagementDS::OWaveLanManagementDS( const unsigned char* /*end*/, const struct ds_t* data, QObject* parent ) |
919 | :QObject( parent, "802.11 DS" ), _data( data ) | 920 | :QObject( parent, "802.11 DS" ), _data( data ) |
920 | { | 921 | { |
921 | odebug << "OWaveLanManagementDS()" << oendl; | 922 | odebug << "OWaveLanManagementDS()" << oendl; |
922 | } | 923 | } |
923 | 924 | ||
924 | 925 | ||
@@ -933,13 +934,13 @@ int OWaveLanManagementDS::channel() const | |||
933 | } | 934 | } |
934 | 935 | ||
935 | /*====================================================================================== | 936 | /*====================================================================================== |
936 | * OWaveLanManagementTim | 937 | * OWaveLanManagementTim |
937 | *======================================================================================*/ | 938 | *======================================================================================*/ |
938 | 939 | ||
939 | OWaveLanManagementTim::OWaveLanManagementTim( const unsigned char* end, const struct tim_t* data, QObject* parent ) | 940 | OWaveLanManagementTim::OWaveLanManagementTim( const unsigned char* /*end*/, const struct tim_t* data, QObject* parent ) |
940 | :QObject( parent, "802.11 Tim" ), _data( data ) | 941 | :QObject( parent, "802.11 Tim" ), _data( data ) |
941 | { | 942 | { |
942 | odebug << "OWaveLanManagementTim()" << oendl; | 943 | odebug << "OWaveLanManagementTim()" << oendl; |
943 | } | 944 | } |
944 | 945 | ||
945 | 946 | ||
@@ -948,13 +949,13 @@ OWaveLanManagementTim::~OWaveLanManagementTim() | |||
948 | } | 949 | } |
949 | 950 | ||
950 | /*====================================================================================== | 951 | /*====================================================================================== |
951 | * OWaveLanManagementIBSS | 952 | * OWaveLanManagementIBSS |
952 | *======================================================================================*/ | 953 | *======================================================================================*/ |
953 | 954 | ||
954 | OWaveLanManagementIBSS::OWaveLanManagementIBSS( const unsigned char* end, const struct ibss_t* data, QObject* parent ) | 955 | OWaveLanManagementIBSS::OWaveLanManagementIBSS( const unsigned char* /*end*/, const struct ibss_t* data, QObject* parent ) |
955 | :QObject( parent, "802.11 IBSS" ), _data( data ) | 956 | :QObject( parent, "802.11 IBSS" ), _data( data ) |
956 | { | 957 | { |
957 | odebug << "OWaveLanManagementIBSS()" << oendl; | 958 | odebug << "OWaveLanManagementIBSS()" << oendl; |
958 | } | 959 | } |
959 | 960 | ||
960 | 961 | ||
@@ -963,13 +964,13 @@ OWaveLanManagementIBSS::~OWaveLanManagementIBSS() | |||
963 | } | 964 | } |
964 | 965 | ||
965 | /*====================================================================================== | 966 | /*====================================================================================== |
966 | * OWaveLanManagementChallenge | 967 | * OWaveLanManagementChallenge |
967 | *======================================================================================*/ | 968 | *======================================================================================*/ |
968 | 969 | ||
969 | OWaveLanManagementChallenge::OWaveLanManagementChallenge( const unsigned char* end, const struct challenge_t* data, QObject* parent ) | 970 | OWaveLanManagementChallenge::OWaveLanManagementChallenge( const unsigned char* /*end*/, const struct challenge_t* data, QObject* parent ) |
970 | :QObject( parent, "802.11 Challenge" ), _data( data ) | 971 | :QObject( parent, "802.11 Challenge" ), _data( data ) |
971 | { | 972 | { |
972 | odebug << "OWaveLanManagementChallenge()" << oendl; | 973 | odebug << "OWaveLanManagementChallenge()" << oendl; |
973 | } | 974 | } |
974 | 975 | ||
975 | 976 | ||
@@ -1029,13 +1030,13 @@ OLLCPacket::~OLLCPacket() | |||
1029 | 1030 | ||
1030 | 1031 | ||
1031 | /*====================================================================================== | 1032 | /*====================================================================================== |
1032 | * OWaveLanControlPacket | 1033 | * OWaveLanControlPacket |
1033 | *======================================================================================*/ | 1034 | *======================================================================================*/ |
1034 | 1035 | ||
1035 | OWaveLanControlPacket::OWaveLanControlPacket( const unsigned char* end, const struct ieee_802_11_control_header* data, OWaveLanPacket* parent ) | 1036 | OWaveLanControlPacket::OWaveLanControlPacket( const unsigned char* /*end*/, const struct ieee_802_11_control_header* data, OWaveLanPacket* parent ) |
1036 | :QObject( parent, "802.11 Control" ), _header( data ) | 1037 | :QObject( parent, "802.11 Control" ), _header( data ) |
1037 | { | 1038 | { |
1038 | odebug << "OWaveLanControlPacket::OWaveLanDataControl(): decoding frame..." << oendl; | 1039 | odebug << "OWaveLanControlPacket::OWaveLanDataControl(): decoding frame..." << oendl; |
1039 | odebug << "Detected subtype is " << controlType() << oendl; | 1040 | odebug << "Detected subtype is " << controlType() << oendl; |
1040 | } | 1041 | } |
1041 | 1042 | ||