[asterisk-commits] branch jcollie/manager-flags r37328 - in /team/jcollie/manager-flags: ./ incl...

[asterisk-commits at lists.digium.com]

Author: jcollie
Date: Mon Jul 10 08:10:01 2006
New Revision: 37328

URL: http://svn.digium.com/view/asterisk?rev=37328&view=rev
Log:
Initialized merge tracking via "svnmerge" with revisions "1-35695" from 
https://origsvn.digium.com/svn/asterisk/trunk

Modified:
    team/jcollie/manager-flags/   (props changed)
    team/jcollie/manager-flags/include/asterisk/manager.h
    team/jcollie/manager-flags/manager.c

Propchange: team/jcollie/manager-flags/
------------------------------------------------------------------------------
    automerge = *

Modified: team/jcollie/manager-flags/include/asterisk/manager.h
URL: http://svn.digium.com/view/asterisk/team/jcollie/manager-flags/include/asterisk/manager.h?rev=37328&r1=37327&r2=37328&view=diff
==============================================================================
--- team/jcollie/manager-flags/include/asterisk/manager.h (original)
+++ team/jcollie/manager-flags/include/asterisk/manager.h Mon Jul 10 08:10:01 2006
@@ -47,13 +47,22 @@
 
 #define DEFAULT_MANAGER_PORT 5038	/* Default port for Asterisk management via TCP */
 
-#define EVENT_FLAG_SYSTEM	(1 << 0) /* System events such as module load/unload */
-#define EVENT_FLAG_CALL		(1 << 1) /* Call event, such as state change, etc */
-#define EVENT_FLAG_LOG		(1 << 2) /* Log events */
-#define EVENT_FLAG_VERBOSE	(1 << 3) /* Verbose messages */
-#define EVENT_FLAG_COMMAND	(1 << 4) /* Ability to read/set commands */
-#define EVENT_FLAG_AGENT	(1 << 5) /* Ability to read/set agent info */
-#define EVENT_FLAG_USER		(1 << 6) /* Ability to read/set user info */
+enum ast_event_flag {
+	/*! System events such as module load/unload */
+	EVENT_FLAG_SYSTEM  = (1 << 0),
+	/*! Call event, such as state change, etc */
+	EVENT_FLAG_CALL    = (1 << 1),
+	/*! Log events */
+	EVENT_FLAG_LOG     = (1 << 2),
+	/*! Verbose messages */
+	EVENT_FLAG_VERBOSE = (1 << 3),
+	/*! Ability to read/set commands */
+	EVENT_FLAG_COMMAND = (1 << 4),
+	/*! Ability to read/set agent info */
+	EVENT_FLAG_AGENT   = (1 << 5),
+	/* Ability to read/set user info */
+	EVENT_FLAG_USER    = (1 << 6)
+};
 
 /* Export manager structures */
 #define AST_MAX_MANHEADERS 80

Modified: team/jcollie/manager-flags/manager.c
URL: http://svn.digium.com/view/asterisk/team/jcollie/manager-flags/manager.c?rev=37328&r1=37327&r2=37328&view=diff
==============================================================================
--- team/jcollie/manager-flags/manager.c (original)
+++ team/jcollie/manager-flags/manager.c Mon Jul 10 08:10:01 2006
@@ -120,7 +120,7 @@
 struct eventqent *master_eventq = NULL;
 
 static struct permalias {
-	int num;
+	enum ast_event_flag num;
 	char *label;
 } perms[] = {
 	{ EVENT_FLAG_SYSTEM, "system" },