retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Added YIGNORE macro to silence compiler warnings about unused values. 

Cleaned up a number of compiler warnings.


git-svn-id: http://yate.null.ro/svn/yate/trunk@5888 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2014-07-31 12:13:52 +00:00
parent 2a07a7217a
commit 08fe54e27a
8 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/Engine.cpp
View File

@ -301,7 +301,7 @@ public:
m_seq(0)
{ }
virtual bool received(Message &msg)
{ ::write(s_super_handle,&m_seq,1); m_seq++; return false; }
{ YIGNORE(::write(s_super_handle,&m_seq,1)); m_seq++; return false; }
char m_seq;
};
@ -1014,7 +1014,7 @@ static void copystream(int dest, int src)
int rd = ::read(src,buf,sizeof(buf));
if (rd <= 0)
break;
::write(dest,buf,rd);
YIGNORE(::write(dest,buf,rd));
}
rotatelogs();
}
@ -2512,7 +2512,7 @@ int Engine::main(int argc, const char** argv, const char** env, RunMode mode, En
if (fd >= 0) {
char pid[32];
::snprintf(pid,sizeof(pid),"%u\n",::getpid());
::write(fd,pid,::strlen(pid));
YIGNORE(::write(fd,pid,::strlen(pid)));
::close(fd);
}
}

5
engine/Resolver.cpp
View File

@ -496,6 +496,7 @@ int Resolver::srvQuery(const char* dname, ObjList& result, String* error)
if ((n <= 0) || (n > NS_MAXLABEL))
break;
insertRecord(result,new SrvRecord(prio,weight,name,port),false,"srvQuery");
YIGNORE(rrClass);
}
#endif
return printResult(Srv,code,dname,result,error);
@ -611,6 +612,7 @@ int Resolver::naptrQuery(const char* dname, ObjList& result, String* error)
n = dn_expand(buf,e,l,rep,sizeof(rep));
l += n;
insertRecord(result,new NaptrRecord(ord,pr,fla,ser,reg,rep),true,"naptrQuery");
YIGNORE(cl);
}
#endif
return printResult(Naptr,code,dname,result,error);
@ -684,6 +686,7 @@ int Resolver::a4Query(const char* dname, ObjList& result, String* error)
// Now get record address
SocketAddr addr(SocketAddr::IPv4,l);
result.append(new TxtRecord(addr.host()));
YIGNORE(rrClass);
}
#endif
return printResult(A4,code,dname,result,error);
@ -759,6 +762,7 @@ int Resolver::a6Query(const char* dname, ObjList& result, String* error)
// Now get record address
SocketAddr addr(SocketAddr::IPv6,l);
result.append(new TxtRecord(addr.host()));
YIGNORE(rrClass);
}
#endif
return printResult(A6,code,dname,result,error);
@ -834,6 +838,7 @@ int Resolver::txtQuery(const char* dname, ObjList& result, String* error)
char txt[NS_MAXSTRING+1];
dn_string(e,l,txt,sizeof(txt));
result.append(new TxtRecord(txt));
YIGNORE(rrClass);
}
#endif
return printResult(Txt,code,dname,result,error);

8
engine/TelEngine.cpp
View File

@ -157,16 +157,16 @@ static const char* dbg_level(int& level)
static void dbg_stderr_func(const char* buf, int level)
{
::write(2,buf,::strlen(buf));
YIGNORE(::write(2,buf,::strlen(buf)));
}
static void dbg_colorize_func(const char* buf, int level)
{
const char* col = debugColor(level);
::write(2,col,::strlen(col));
::write(2,buf,::strlen(buf));
YIGNORE(::write(2,col,::strlen(col)));
YIGNORE(::write(2,buf,::strlen(buf)));
col = debugColor(-2);
::write(2,col,::strlen(col));
YIGNORE(::write(2,col,::strlen(col)));
}
static void (*s_output)(const char*,int) = dbg_stderr_func;

7
libs/yiax/frame.cpp
View File

@ -1083,12 +1083,7 @@ IAXFrame* IAXFrame::parse(const unsigned char* buf, unsigned int len, IAXEngine*
u_int16_t dlen = (buf[2] << 8) | buf[3];
if ((unsigned int)(dlen + 4) > len)
break;
scn = (buf[0] << 8) | buf[1];
bool retrans = false;
if (scn & 0x8000) {
retrans = true;
scn &= 0x7fff;
}
scn = 0x7fff & ((buf[0] << 8) | buf[1]);
IAXTrunkFrameTrans* t = IAXTrunkFrameTrans::get(list,scn);
t->m_blocks.append(new DataBlock((void*)(buf+4),dlen));
dlen += 4;

2
modules/cdrfile.cpp
View File

@ -127,7 +127,7 @@ bool CdrFileHandler::received(Message &msg)
String str = m_format;
str += EOLN;
msg.replaceParams(str);
::write(m_file,str.c_str(),str.length());
YIGNORE(::write(m_file,str.c_str(),str.length()));
}
return false;
};

2
modules/client/osschan.cpp
View File

@ -309,7 +309,7 @@ unsigned long OssConsumer::Consume(const DataBlock &data, unsigned long tStamp,
{
if (m_device->closed() || data.null())
return 0;
::write(m_device->fd(),data.data(),data.length());
YIGNORE(::write(m_device->fd(),data.data(),data.length()));
m_total += data.length();
return invalidStamp();
}

2
modules/wavefile.cpp
View File

@ -394,7 +394,7 @@ void WaveSource::run()
m_time = tpos = Time::now();
if (!r) {
if (m_repeatPos >= 0) {
DDebug(&__plugin,DebugAll,"Autorepeating from offset %ld [%p]",
DDebug(&__plugin,DebugAll,"Autorepeating from offset " FMT64 " [%p]",
m_repeatPos,this);
m_stream->seek(m_repeatPos);
m_data.assign(0,blen);

8
yateclass.h
View File

@ -221,6 +221,8 @@ namespace TelEngine {
#define FORMAT_CHECK(f)
#endif
#define YIGNORE(v) while (v) { break; }
#ifdef HAVE_BLOCK_RETURN
#define YSTRING(s) (*({static const String str(s);&str;}))
#define YATOM(s) (*({static const String* str(0);str ? str : String::atom(str,s);}))
@ -671,6 +673,12 @@ class ObjList;
class NamedCounter;
#if 0 /* for documentation generator */
/**
* Macro to ignore the result of a function
* @param value Returned value to be ignored, must be interpretable as boolean
*/
void YIGNORE(primitive value);
/**
* Macro to create a local static String if supported by compiler, use with caution
* @param string Literal constant string