ack
On Sat, Apr 16, 2011 at 4:27 PM, Russell Bryant
<russell(a)russellbryant.net> wrote:
Use spaces for indentation and strip some trailing whitespace.
Also,
list public members of MatahariAgent before protected.
Signed-off-by: Russell Bryant <russell(a)russellbryant.net>
---
src/include/matahari/mh_agent.h | 42 ++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/src/include/matahari/mh_agent.h b/src/include/matahari/mh_agent.h
index 62c5aef..50fd85f 100644
--- a/src/include/matahari/mh_agent.h
+++ b/src/include/matahari/mh_agent.h
@@ -40,27 +40,34 @@ using namespace std;
namespace _qmf = qmf::org::matahariproject;
namespace _qtype = ::qpid::types;
-typedef struct mainloop_qmf_s
-{
- GSource source;
- qmf::AgentSession session;
- qmf::AgentEvent event;
- guint id;
- void *user_data;
- GDestroyNotify dnotify;
- gboolean (*dispatch)(qmf::AgentSession session, qmf::AgentEvent event, gpointer
user_data);
-
+typedef struct mainloop_qmf_s {
+ GSource source;
+ qmf::AgentSession session;
+ qmf::AgentEvent event;
+ guint id;
+ void *user_data;
+ GDestroyNotify dnotify;
+ gboolean (*dispatch)(qmf::AgentSession session, qmf::AgentEvent event, gpointer
user_data);
} mainloop_qmf_t;
extern mainloop_qmf_t *mainloop_add_qmf(int priority, qmf::AgentSession session,
- gboolean (*dispatch)(qmf::AgentSession session,
qmf::AgentEvent event, gpointer userdata),
- GDestroyNotify notify, gpointer userdata);
+ gboolean (*dispatch)(qmf::AgentSession session,
qmf::AgentEvent event, gpointer userdata),
+ GDestroyNotify notify, gpointer userdata);
extern gboolean mainloop_destroy_qmf(mainloop_qmf_t* source);
class MatahariAgent
{
- protected:
+public:
+ MatahariAgent() {};
+ ~MatahariAgent() {};
+
+ virtual int setup(qmf::AgentSession session) { return 0; };
+ virtual gboolean invoke(qmf::AgentSession session, qmf::AgentEvent event, gpointer
user_data) { return FALSE; };
+ int init(int argc, char **argv, const char* proc_name);
+ void run();
+
+protected:
GMainLoop *mainloop;
mainloop_qmf_t *qpid_source;
@@ -68,15 +75,6 @@ class MatahariAgent
qmf::AgentSession _agent_session;
qpid::messaging::Connection _amqp_connection;
qmf::org::matahariproject::PackageDefinition _package;
-
- public:
- MatahariAgent() {};
- ~MatahariAgent() {};
-
- virtual int setup(qmf::AgentSession session) { return 0; };
- virtual gboolean invoke(qmf::AgentSession session, qmf::AgentEvent event, gpointer
user_data) { return FALSE; };
- int init(int argc, char **argv, const char* proc_name);
- void run();
};
#endif // __MATAHARI_DAEMON_H
--
1.7.4.4
_______________________________________________
Matahari mailing list
Matahari(a)lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/matahari