aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkurtis.heimerl <kurtis.heimerl@19bc5d8c-e614-43d4-8b26-e1612bc8e597>2012-12-22 04:30:56 +0000
committerkurtis.heimerl <kurtis.heimerl@19bc5d8c-e614-43d4-8b26-e1612bc8e597>2012-12-22 04:30:56 +0000
commit1a2d244c70aa8af1cef2ba365ab7b7f31d53c109 (patch)
tree13934af92af443bdd2d0d78a180fb1f5ec0c3a49
parent0775c80140060bbfdde0504ee53583681ae26bef (diff)
Correction of trivial warnings.
git-svn-id: http://wush.net/svn/range/software/public/openbts/trunk@4670 19bc5d8c-e614-43d4-8b26-e1612bc8e597
-rw-r--r--CommonLibs/ConfigurationTest.cpp2
-rw-r--r--CommonLibs/URLEncode.cpp2
-rw-r--r--Transceiver52M/DummyLoad.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/CommonLibs/ConfigurationTest.cpp b/CommonLibs/ConfigurationTest.cpp
index a21ea86..3a2045f 100644
--- a/CommonLibs/ConfigurationTest.cpp
+++ b/CommonLibs/ConfigurationTest.cpp
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
gConfig.setUpdateHook(purgeConfig);
- char *keys[5] = {"key1", "key2", "key3", "key4", "key5"};
+ const char *keys[5] = {"key1", "key2", "key3", "key4", "key5"};
for (int i=0; i<5; i++) {
gConfig.set(keys[i],i);
diff --git a/CommonLibs/URLEncode.cpp b/CommonLibs/URLEncode.cpp
index 870db33..025ef60 100644
--- a/CommonLibs/URLEncode.cpp
+++ b/CommonLibs/URLEncode.cpp
@@ -35,7 +35,7 @@ string URLEncode(const string &c)
{
static const char *digits = "01234567890ABCDEF";
string retVal="";
- for (int i=0; i<c.length(); i++)
+ for (size_t i=0; i<c.length(); i++)
{
const char ch = c[i];
if (isalnum(ch) || strchr("-_.!~'()",ch)) {
diff --git a/Transceiver52M/DummyLoad.cpp b/Transceiver52M/DummyLoad.cpp
index d11226e..38718a0 100644
--- a/Transceiver52M/DummyLoad.cpp
+++ b/Transceiver52M/DummyLoad.cpp
@@ -97,11 +97,11 @@ int DummyLoad::readSamples(short *buf, int len, bool *overrun,
underrunLock.unlock();
if (currstamp+len < timestamp) {
usleep(100);
- return NULL;
+ return 0;
}
else if (currstamp < timestamp) {
usleep(100);
- return NULL;
+ return 0;
}
else if (timestamp+len < currstamp) {
memcpy(buf,dummyBurst+dummyBurstCursor*2,sizeof(short)*2*(dummyBurstSz-dummyBurstCursor));