From 2d66c27090d6654bbda21f7cc8351b9a64f9b4f9 Mon Sep 17 00:00:00 2001 From: bustico Date: Tue, 23 Dec 2014 09:35:46 +0000 Subject: Author: Piotr Esden-Tempski Date: Mon Dec 22 18:54:08 2014 -0800 Added toplevel README.md file. Author: Piotr Esden-Tempski Date: Mon Dec 22 18:38:50 2014 -0800 Added missing LIB variable for Makefile.osx Date: Mon Dec 22 18:30:20 2014 -0800 Bumped version. Author: Piotr Esden-Tempski Date: Mon Dec 22 18:15:14 2014 -0800 Switched from explicit naming of *.pc files to wildcard. Author: Piotr Esden-Tempski Date: Mon Dec 22 18:06:52 2014 -0800 A bunch of pkg-config file improvements. - Automatically finding *.pc.in files and running pattern replacements on them. - Replaced static paths in ivy.pc.in with @@ patterns. - Removed @DESTDIR@ as this path should not appear in any of the installed files, it is only used to direct the build system where to put the files. See deb package build process. - Moved LIB variables to Libs and INC to Cflags. - pkgconfiginstall target now depends on pkgconfig target. Otherwise the *.pc files might not be generated when make install is invoked. - Added missing MAJOR and MINOR variable definitions in Makefile.osx. Author: Piotr Esden-Tempski Date: Mon Dec 22 17:23:54 2014 -0800 Updated the ivy pkgconfig to use the same patterns as the glib one. Author: Felix Ruess Date: Fri Nov 14 15:06:18 2014 +0100 add pkg-config file for ivy Author: Piotr Esden-Tempski Date: Mon Dec 22 03:48:57 2014 -0800 Fixing the format security warning. The warning is a valid security issue, allowing for access to memory regions not intended for public use. For reference please see: https://fedoraproject.org/wiki/Format-Security-FAQ --- tools/ivythroughput.cpp | 37 ++++--------------------------------- 1 file changed, 4 insertions(+), 33 deletions(-) (limited to 'tools/ivythroughput.cpp') diff --git a/tools/ivythroughput.cpp b/tools/ivythroughput.cpp index 68543e9..6773892 100644 --- a/tools/ivythroughput.cpp +++ b/tools/ivythroughput.cpp @@ -281,10 +281,6 @@ void emetteur (const char* bus, KindOfTest kod, int testDuration, # | | | __/ | (__ | __/ | | \ |_ | __/ | |_| | | | # |_| \___| \___| \___| |_| \__| \___| \__,_| |_| */ -#if defined(__GNUC__) && __GNUC_PREREQ(4,7) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat-security" -#endif void recepteur_tp (const char* bus, KindOfTest kod, unsigned int inst, const ListOfString& regexps, unsigned int exitAfter) { @@ -305,7 +301,7 @@ void recepteur_tp (const char* bus, KindOfTest kod, unsigned int inst, debugInt++; string reg = *iter; if (regexpAreUniq) { ((reg += "(") += stream.str()) += ")?";} - IvyBindMsg (recepteurCB, (void *) long(inst), reg.c_str()); + IvyBindMsg (recepteurCB, (void *) long(inst), "%s", reg.c_str()); } IvyBindMsg (startOfSeqCB, NULL, "^start(OfSequence)"); IvyBindMsg (endOfSeqCB, NULL, "^end(OfSequence)"); @@ -320,9 +316,6 @@ void recepteur_tp (const char* bus, KindOfTest kod, unsigned int inst, IvyStart (bus); IvyMainLoop (); } -#if defined(__GNUC__) && __GNUC_PREREQ(4,7) -#pragma GCC diagnostic pop -#endif void recepteur_ml (const char* bus, KindOfTest kod, unsigned int inst, const ListOfString& regexps) @@ -346,15 +339,7 @@ void recepteur_ml (const char* bus, KindOfTest kod, unsigned int inst, debugInt++; string reg = *iter; if (regexpAreUniq) { (reg += " ") += stream.str();} -#if defined(__GNUC__) && __GNUC_PREREQ(4,7) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat-security" -#endif - bindIdList.push_back (IvyBindMsg (recepteurCB, (void *) long(inst), reg.c_str())); -#if defined(__GNUC__) && __GNUC_PREREQ(4,7) -#pragma GCC diagnostic pop -#endif - + bindIdList.push_back (IvyBindMsg (recepteurCB, (void *) long(inst), "%s", reg.c_str())); } IvyBindMsg (startOfSeqCB, NULL, "^start(OfSequence)"); IvyBindMsg (endOfSeqCB, NULL, "^end(OfSequence)"); @@ -555,14 +540,7 @@ void sendAllMessageCB (TimerId id, void *user_data, unsigned long delta) IvySendMsg ("startOfSequence"); ListOfString::iterator iter; for (iter=messages->begin(); iter != messages->end(); iter++) { -#if defined(__GNUC__) && __GNUC_PREREQ(4,7) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat-security" -#endif - envoyes += IvySendMsg ((*iter).c_str()); -#if defined(__GNUC__) && __GNUC_PREREQ(4,7) -#pragma GCC diagnostic pop -#endif + envoyes += IvySendMsg ("%s", (*iter).c_str()); } IvySendMsg ("endOfSequence"); @@ -641,15 +619,8 @@ void desabonneEtReabonneCB (TimerId id, void *user_data, unsigned long delta) ListOfString::const_iterator iter2; for (iter2=mds->regexps->begin(); iter2 != mds->regexps->end(); iter2++) { string reg = *iter2; -#if defined(__GNUC__) && __GNUC_PREREQ(4,7) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat-security" -#endif mds->bindIdList->push_back (IvyBindMsg (recepteurCB, (void *) long(mds->inst), - reg.c_str())); -#if defined(__GNUC__) && __GNUC_PREREQ(4,7) -#pragma GCC diagnostic pop -#endif + "%s", reg.c_str())); } // CHANGE REGEXP -- cgit v1.1