Module: sems Branch: master Commit: 8c5b96986ad4058cf907539a97ba082e82cb5a44 URL: https://github.com/sems-server/sems/commit/8c5b96986ad4058cf907539a97ba082e82cb5a44
Author: Stefan Sayer <sa...@cs.tu-berlin.de> Committer: Stefan Sayer <sa...@cs.tu-berlin.de> Date: 2016-02-08T11:40:45+01:00 Merge pull request #6 from mslehto/master core: fix variable sizes and initializations seen by compile warnings on FreeBSD with clang++ --- Modified: core/AmUtils.cpp Modified: core/sip/pcap_logger.cpp Modified: tools/logfile-splitter.cpp --- Diff: https://github.com/sems-server/sems/commit/8c5b96986ad4058cf907539a97ba082e82cb5a44.diff Patch: https://github.com/sems-server/sems/commit/8c5b96986ad4058cf907539a97ba082e82cb5a44.patch --- diff --git a/core/AmUtils.cpp b/core/AmUtils.cpp index 7377785..4a0a678 100644 --- a/core/AmUtils.cpp +++ b/core/AmUtils.cpp @@ -1131,8 +1131,8 @@ bool run_regex_mapping(const RegexMappingVector& mapping, const char* test_s, for (g = 1; g < MAX_GROUPS; g++) { if (groups[g].rm_so == (int)(size_t)-1) break; DBG("group %u: [%2u-%2u]: %.*s\n", - g, groups[g].rm_so, groups[g].rm_eo, - groups[g].rm_eo - groups[g].rm_so, test_s + groups[g].rm_so); + g, (unsigned int)groups[g].rm_so, (unsigned int)groups[g].rm_eo, + (int)(groups[g].rm_eo - groups[g].rm_so), test_s + groups[g].rm_so); std::string match(test_s + groups[g].rm_so, groups[g].rm_eo - groups[g].rm_so); ReplaceStringInPlace(result, "\\" + int2str(g), match); diff --git a/core/sip/pcap_logger.cpp b/core/sip/pcap_logger.cpp index be5ec01..0efdb9b 100644 --- a/core/sip/pcap_logger.cpp +++ b/core/sip/pcap_logger.cpp @@ -125,8 +125,8 @@ int pcap_logger::log(const char *data, int data_len, hdr.ip.ip_hl = 5; hdr.ip.ip_v = 4; hdr.ip.ip_tos = 0; - hdr.ip.ip_len = htons(size); - hdr.ip.ip_id = htonl(54321); + hdr.ip.ip_len = (unsigned short) htons(size); + hdr.ip.ip_id = (unsigned short)htonl(54321); hdr.ip.ip_off = 0; hdr.ip.ip_ttl = 255; hdr.ip.ip_p = 0x11; // UDP diff --git a/tools/logfile-splitter.cpp b/tools/logfile-splitter.cpp index 0d07e10..c2c709b 100644 --- a/tools/logfile-splitter.cpp +++ b/tools/logfile-splitter.cpp @@ -31,7 +31,7 @@ int main(int argc, char *argv[]) exit(1); } - long int log_offset = -1; + long long int log_offset = -1; char* endptr; log_offset = strtoll(argv[3], &endptr, 10); // offset of thread if ((errno == ERANGE && (log_offset == LLONG_MAX || log_offset == LLONG_MIN)) _______________________________________________ Semsdev mailing list Semsdev@lists.iptel.org http://lists.iptel.org/mailman/listinfo/semsdev
