libtransport.git Changeset - c8d1ec32d0fa

Changeset - c8d1ec32d0fa

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Steffen Vogel - 8 years ago 2017-10-30 16:51:43
post@steffenvogel.de

replace __attribute__ ((unused)) with #ifdefs

3 files changed with 9 insertions and 3 deletions:

backends/libpurple/main.cpp

libtransport/AdminInterface.cpp

spectrum/src/main.cpp

0 comments (0 inline, 0 general)

backends/libpurple/main.cpp

➞

Show inline comments

@@ @@ -1419,59 +1419,61 @@ static PurpleConversationUiOps conversation_ui_ops = @@
 	conv_write_im,//conv_write_chat,                              /* write_chat           */
 	conv_write_im,             /* write_im             */
 	conv_write,//conv_write_conv,           /* write_conv           */
 	conv_chat_add_users,       /* chat_add_users       */
 	NULL,//conv_chat_rename_user,     /* chat_rename_user     */
 	conv_chat_remove_users,    /* chat_remove_users    */
 	NULL,//pidgin_conv_chat_update_user,     /* chat_update_user     */
 	conv_present,//pidgin_conv_present_conversation, /* present              */
 	conv_has_focus,//pidgin_conv_has_focus,            /* has_focus            */
 	NULL,//pidgin_conv_custom_smiley_add,    /* custom_smiley_add    */
 	NULL,//pidgin_conv_custom_smiley_write,  /* custom_smiley_write  */
 	NULL,//pidgin_conv_custom_smiley_close,  /* custom_smiley_close  */
 	NULL,//pidgin_conv_send_confirm,         /* send_confirm         */
 	NULL,
 	NULL,
 	NULL,
 	NULL
 };
 struct Dis {
 	std::string name;
 	std::string protocol;
 };
 __attribute__ ((unused))
 // currently unused
 #if 0
 static gboolean disconnectMe(void *data) {
 	Dis *d = (Dis *) data;
 	PurpleAccount *account = purple_accounts_find_wrapped(d->name.c_str(), d->protocol.c_str());
 	delete d;
 	if (account) {
 		np->handleLogoutRequest(np->m_accounts[account], purple_account_get_username_wrapped(account));
+	}
 	return FALSE;
+}
 #endif
 static gboolean pingTimeout(void *data) {
 	np->checkPing();
 	return TRUE;
+}
 static void connection_report_disconnect(PurpleConnection *gc, PurpleConnectionError reason, const char *text){
 	PurpleAccount *account = purple_connection_get_account_wrapped(gc);
 	np->handleDisconnected(np->m_accounts[account], (int) reason, text ? text : "");
 // 	Dis *d = new Dis;
 // 	d->name = purple_account_get_username_wrapped(account);
 // 	d->protocol = purple_account_get_protocol_id_wrapped(account);
 // 	purple_timeout_add_seconds_wrapped(10, disconnectMe, d);
+}
 static PurpleConnectionUiOps conn_ui_ops =
+{
 	NULL,
 	NULL,
 	NULL,//connection_disconnected,
 	NULL,
 	NULL,
 	NULL,
 	NULL,

libtransport/AdminInterface.cpp

➞

Show inline comments

@@ @@ -20,56 +20,58 @@ @@
 #include "transport/AdminInterface.h"
 #include "transport/AdminInterfaceCommand.h"
 #include "transport/User.h"
 #include "transport/Transport.h"
 #include "transport/StorageBackend.h"
 #include "transport/UserManager.h"
 #include "transport/NetworkPluginServer.h"
 #include "transport/Logging.h"
 #include "transport/UserRegistration.h"
 #include "transport/Frontend.h"
 #include "transport/MemoryUsage.h"
 #include "transport/Config.h"
 #include <boost/foreach.hpp>
 #include <boost/lexical_cast.hpp>
 #include <Swiften/Version.h>
 #define HAVE_SWIFTEN_3  (SWIFTEN_VERSION >= 0x030000)
 namespace Transport {
 DEFINE_LOGGER(logger, "AdminInterface");
 __attribute__ ((unused))
 // currently unused
 #if 0
 static std::string getArg(const std::string &body) {
 	std::string ret;
 	if (body.find(" ") == std::string::npos)
 		return ret;
 	return body.substr(body.find(" ") + 1);
+}
 #endif
 class StatusCommand : public AdminInterfaceCommand {
 	public:
 		StatusCommand(NetworkPluginServer *server, UserManager *userManager) :
 												AdminInterfaceCommand("status",
 												AdminInterfaceCommand::General,
 												AdminInterfaceCommand::GlobalContext,
 												AdminInterfaceCommand::AdminMode,
 												AdminInterfaceCommand::Get) {
 			m_server = server;
 			m_userManager = userManager;
 			setDescription("Shows instance status");
+		}
 		virtual std::string handleGetRequest(UserInfo &uinfo, User *user, std::vector<std::string> &args) {
 			std::string ret = AdminInterfaceCommand::handleGetRequest(uinfo, user, args);
 			if (!ret.empty()) {
 				return ret;
+			}
 			int users = m_userManager->getUserCount();
 			int backends = m_server->getBackendCount();
 			ret = "Running (" + boost::lexical_cast<std::string>(users) + " users connected using " + boost::lexical_cast<std::string>(backends) + " backends)";

spectrum/src/main.cpp

➞

Show inline comments

@@ @@ -57,55 +57,57 @@ Config *config_ = NULL; @@
 static void stop_spectrum() {
 	userManager->removeAllUsers(false);
 	component_->stop();
 	eventLoop_->stop();
+}
 static void spectrum_sigint_handler(int sig) {
 	eventLoop_->postEvent(&stop_spectrum);
+}
 static void spectrum_sigterm_handler(int sig) {
 	eventLoop_->postEvent(&stop_spectrum);
+}
 #ifdef WIN32
 BOOL spectrum_control_handler( DWORD fdwCtrlType ) {
 	if (fdwCtrlType == CTRL_C_EVENT || fdwCtrlType == CTRL_CLOSE_EVENT) {
 		eventLoop_->postEvent(&stop_spectrum);
 		return TRUE;
+	}
 	return FALSE;
+}
 #endif
 __attribute__ ((unused))
 // currently unused
 #if 0
 static void removeOldIcons(std::string iconDir) {
 	std::vector<std::string> dirs;
 	dirs.push_back(iconDir);
 	boost::thread thread(boost::bind(Util::removeEverythingOlderThan, dirs, time(NULL) - 3600*24*14));
+}
 #endif
 #ifndef WIN32
 static void daemonize(const char *cwd, const char *lock_file) {
 	pid_t pid, sid;
 	FILE* lock_file_f;
 	char process_pid[20];
 	/* already a daemon */
 	if ( getppid() == 1 ) return;
 	/* Fork off the parent process */
 	pid = fork();
 	if (pid < 0) {
 		exit(1);
+	}
 	/* If we got a good PID, then we can exit the parent process. */
 	if (pid > 0) {
 		if (lock_file) {
 			/* write our pid into it & close the file. */
 			lock_file_f = fopen(lock_file, "w+");
 			if (lock_file_f == NULL) {
 				std::cerr << "Cannot create lock file " << lock_file << ". Exiting\n";
 				exit(1);
+			}
 			sprintf(process_pid,"%d\n",pid);

0 comments (0 inline, 0 general)