constcast
/
vermont
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed additional GCC warnings, with SUPPORT_DTLS=OFF

master
Emanuel Vintila 2017-12-17 20:26:20 +01:00
parent 59f2730478
commit 0bc7c84cd0
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/analysis/autofocus_report.cpp
View File

@ -158,7 +158,7 @@ void report::f_post(vector<treeRecord*>& p_treeRecords,uint32_t index,report_enu
list<treeNode*>::iterator iter = specNodes.begin();
uint32_t lastindex = (index - 1 + p_treeRecords.capacity()) % p_treeRecords.capacity();
double change_global;
double change_global = .0;
if (p_treeRecords[lastindex] != NULL)
{
change_global = (double) (numTotal * 100) / (double) p_treeRecords[lastindex]->root->data.m_attributes[attribute]->numCount - 100.0;

2
src/modules/analysis/fpsigmatcher/Utils.c
View File

@ -144,7 +144,7 @@ char ** get_filenames(const char * directory, int * num_of_files) {
/* Skip non-regular files (e.g. directories) */
if ( ((fileNameSize < (int)sizeof(filename)) && (fileNameSize > 0))
&& (stat(filename, &dirEntStat) == 0) && (S_ISREG(dirEntStat.st_mode)) ) {
snprintf(filenames[i], MAX_SIZE_OF_FILENAME-1, "%s", pDirEnt->d_name);
snprintf(filenames[i], MAX_SIZE_OF_FILENAME, "%s", pDirEnt->d_name);
//printf( "ADDED: %s\n", filenames[i] );
i++;
}

1
src/modules/ipfix/aggregator/FlowHashtable.cpp
View File

@ -250,6 +250,7 @@ int FlowHashtable::aggregateField(TemplateInfo::FieldInfo* basefi, TemplateInfo:
if (*((uint32_t*)baseData)==0) {
*((uint32_t*)baseData) = *((uint32_t*)deltaData);
}
return 0;
case IPFIX_ETYPEID_maxPacketGap:
*(uint32_t*)baseData = greaterUint32Nbo(*(uint32_t*)baseData, *(uint32_t*)deltaData);

2
src/osdep/linux/ThreadCPUInterface.cpp
View File

@ -148,7 +148,7 @@ ThreadCPUInterface::SystemInfo ThreadCPUInterface::getSystemInfo()
si.freeMemory = mem;
if (fscanf(f, "Buffers: %u kB\n", &mem) != 1) {
// Linux 3.14 introduces an additional line in the /proc/meminfo output
fscanf(f, "MemAvailable: %*u kB\n");
if (fscanf(f, "MemAvailable: %*u kB\n")) {} // optional, so just ignore the result
if (fscanf(f, "Buffers: %u kB\n", &mem) != 1)
THROWEXCEPTION("failed to parse file '%s' 3", procfile.c_str());
}