diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/ivyprobe.c | 37 | ||||
| -rw-r--r-- | tools/ivythroughput.cpp | 37 |
2 files changed, 8 insertions, 66 deletions
diff --git a/tools/ivyprobe.c b/tools/ivyprobe.c index 8b164a1..0074192 100644 --- a/tools/ivyprobe.c +++ b/tools/ivyprobe.c @@ -171,15 +171,7 @@ void HandleStdin (Channel channel, IVY_HANDLE fd, void *data) printf("Error compiling '%s', %s, not bound\n", arg, errbuf); } else { IvyBindingFree( binding ); - -#if defined(__GNUC__) && __GNUC_PREREQ(4,7) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat-security" -#endif - IvyBindMsg (Callback, NULL, arg); -#if defined(__GNUC__) && __GNUC_PREREQ(4,7) -#pragma GCC diagnostic pop -#endif + IvyBindMsg (Callback, NULL, "%s", arg); } } @@ -243,14 +235,7 @@ void HandleStdin (Channel channel, IVY_HANDLE fd, void *data) } } else { cmd = strtok (buf, "\n"); -#if defined(__GNUC__) && __GNUC_PREREQ(4,7) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat-security" -#endif - err = IvySendMsg (cmd); -#if defined(__GNUC__) && __GNUC_PREREQ(4,7) -#pragma GCC diagnostic pop -#endif + err = IvySendMsg ("%s", cmd); printf("-> Sent to %d peer%s\n", err, err == 1 ? "" : "s"); } } @@ -355,14 +340,7 @@ void BindMsgOfFile( const char * regex_file ) if ( size > 1 ) { line[size-1] = '\0'; /* supress \n */ -#if defined(__GNUC__) && __GNUC_PREREQ(4,7) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat-security" -#endif - IvyBindMsg (Callback, NULL, line); -#if defined(__GNUC__) && __GNUC_PREREQ(4,7) -#pragma GCC diagnostic pop -#endif + IvyBindMsg (Callback, NULL, "%s", line); } } } @@ -455,14 +433,7 @@ int main(int argc, char *argv[]) for (; optind < argc; optind++) { printf("Binding to '%s'\n", argv[optind] ); -#if defined(__GNUC__) && __GNUC_PREREQ(4,7) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat-security" -#endif - IvyBindMsg (Callback, NULL, argv[optind]); -#if defined(__GNUC__) && __GNUC_PREREQ(4,7) -#pragma GCC diagnostic pop -#endif + IvyBindMsg (Callback, NULL, "%s", argv[optind]); } 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 |