diff --git a/Common/GmshMessage.cpp b/Common/GmshMessage.cpp index 4a8847a4e4a6ac1c17b56552b5093651b3fcff3a..9a7c324b583fa4900c2e6d345f25097a51f8e7fc 100644 --- a/Common/GmshMessage.cpp +++ b/Common/GmshMessage.cpp @@ -78,13 +78,13 @@ onelab::server *onelab::server::_server = 0; #if defined(HAVE_NO_VSNPRINTF) static int vsnprintf(char *str, size_t size, const char *fmt, va_list ap) { - if (strlen(fmt) > size - 1) { // just copy the format - strncpy(str, fmt, size - 1); - str[size - 1] = '\0'; - return size; - } - return vsprintf(str, fmt, ap); - } + if (strlen(fmt) > size - 1) { // just copy the format + strncpy(str, fmt, size - 1); + str[size - 1] = '\0'; + return size; + } + return vsprintf(str, fmt, ap); +} #endif #endif @@ -1175,11 +1175,10 @@ void Msg::LoadOnelabClient(const std::string &clientName, const std::string &soc } GmshClient *Msg::GetGmshClient() -{ - return _client; +{ + return _client; } - int Msg::GetNumOnelabClients() { #if defined(HAVE_ONELAB) diff --git a/Fltk/FlGui.h b/Fltk/FlGui.h index 0f28eecc6400c66182e576afaa75d5133a63d9af..7aac6bc5c8848ddbf387c5184f316adfcd2829a6 100644 --- a/Fltk/FlGui.h +++ b/Fltk/FlGui.h @@ -90,7 +90,7 @@ class FlGui{ // wait (at most time seconds) for any events, then process them static void wait(double time); // is a file opened through the Mac Finder? - static void setOpenedThroughMacFinder(const std::string &name); + static void setOpenedThroughMacFinder(const std::string &name); static std::string getOpenedThroughMacFinder(); // test application-level keyboard shortcuts int testGlobalShortcuts(int event);