X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilccore%2Fsilccommand.h;fp=lib%2Fsilccore%2Fsilccommand.h;h=691d96eee68c6a62dfaa2a6d5fafd7d53cdfb055;hb=48df45ce74e38c47a8a05a5dcb3b57a61eeb0b5d;hp=531f1935aa114e9c66b939c02db1d810fad226a9;hpb=0e035ff559c5c5c748b2fda72a1cd1935afec33a;p=silc.git

diff --git a/lib/silccore/silccommand.h b/lib/silccore/silccommand.h
index 531f1935..691d96ee 100644
--- a/lib/silccore/silccommand.h
+++ b/lib/silccore/silccommand.h
@@ -159,67 +159,6 @@ typedef unsigned char SilcCommand;
 #define SILC_COMMAND_RESERVED           255
 /***/
 
-/****d* silccore/SilcCommandAPI/SilcCommandStatus
- *
- * NAME
- * 
- *    typedef SilcUInt8 SilcCommandStatus;
- *
- * DESCRIPTION
- *
- *    The SilcCommandStatus type definition and the status defines.
- *    The server returns a status in each Command Payload indicating
- *    the status of the command.
- *
- * SOURCE
- */
-typedef SilcUInt8 SilcCommandStatus;
-
-/* Command Status messages */
-#define SILC_STATUS_OK                      0
-#define SILC_STATUS_LIST_START              1
-#define SILC_STATUS_LIST_ITEM               2
-#define SILC_STATUS_LIST_END                3
-#define SILC_STATUS_ERR_NO_SUCH_NICK        10
-#define SILC_STATUS_ERR_NO_SUCH_CHANNEL     11
-#define SILC_STATUS_ERR_NO_SUCH_SERVER      12
-#define SILC_STATUS_ERR_TOO_MANY_TARGETS    13
-#define SILC_STATUS_ERR_NO_RECIPIENT        14
-#define SILC_STATUS_ERR_UNKNOWN_COMMAND     15
-#define SILC_STATUS_ERR_WILDCARDS           16
-#define SILC_STATUS_ERR_NO_CLIENT_ID        17
-#define SILC_STATUS_ERR_NO_CHANNEL_ID       18
-#define SILC_STATUS_ERR_NO_SERVER_ID        19
-#define SILC_STATUS_ERR_BAD_CLIENT_ID       20
-#define SILC_STATUS_ERR_BAD_CHANNEL_ID      21
-#define SILC_STATUS_ERR_NO_SUCH_CLIENT_ID   22
-#define SILC_STATUS_ERR_NO_SUCH_CHANNEL_ID  23
-#define SILC_STATUS_ERR_NICKNAME_IN_USE     24
-#define SILC_STATUS_ERR_NOT_ON_CHANNEL      25
-#define SILC_STATUS_ERR_USER_NOT_ON_CHANNEL 26
-#define SILC_STATUS_ERR_USER_ON_CHANNEL     27
-#define SILC_STATUS_ERR_NOT_REGISTERED      28
-#define SILC_STATUS_ERR_NOT_ENOUGH_PARAMS   29
-#define SILC_STATUS_ERR_TOO_MANY_PARAMS     30
-#define SILC_STATUS_ERR_PERM_DENIED         31
-#define SILC_STATUS_ERR_BANNED_FROM_SERVER  32
-#define SILC_STATUS_ERR_BAD_PASSWORD        33
-#define SILC_STATUS_ERR_CHANNEL_IS_FULL     34
-#define SILC_STATUS_ERR_NOT_INVITED         35
-#define SILC_STATUS_ERR_BANNED_FROM_CHANNEL 36
-#define SILC_STATUS_ERR_UNKNOWN_MODE        37
-#define SILC_STATUS_ERR_NOT_YOU             38
-#define SILC_STATUS_ERR_NO_CHANNEL_PRIV     39
-#define SILC_STATUS_ERR_NO_CHANNEL_FOPRIV   40
-#define SILC_STATUS_ERR_NO_SERVER_PRIV      41
-#define SILC_STATUS_ERR_NO_ROUTER_PRIV      42
-#define SILC_STATUS_ERR_BAD_NICKNAME        43
-#define SILC_STATUS_ERR_BAD_CHANNEL         44
-#define SILC_STATUS_ERR_AUTH_FAILED         45
-#define SILC_STATUS_ERR_UNKNOWN_ALGORITHM   46
-#define SILC_STATUS_ERR_NO_SUCH_SERVER_ID   47
-/***/
-
 /* Prototypes */
 
 /****f* silccore/SilcCommandAPI/silc_command_payload_parse
@@ -324,8 +263,8 @@ SilcBuffer silc_command_payload_encode_vap(SilcCommand cmd,
  *
  *    SilcBuffer 
  *    silc_command_reply_payload_encode_va(SilcCommand cmd, 
- *                                         SilcCommandStatus status,
- *                                         SilcCommandStatus error,
+ *                                         SilcStatus status,
+ *                                         SilcStatus error,
  *                                         SilcUInt16 ident,
  *                                         SilcUInt32 argc, ...);
  *
@@ -352,8 +291,8 @@ SilcBuffer silc_command_payload_encode_vap(SilcCommand cmd,
  ***/
 SilcBuffer 
 silc_command_reply_payload_encode_va(SilcCommand cmd, 
-				     SilcCommandStatus status,
-				     SilcCommandStatus error,
+				     SilcStatus status,
+				     SilcStatus error,
 				     SilcUInt16 ident,
 				     SilcUInt32 argc, ...);
 
@@ -363,8 +302,8 @@ silc_command_reply_payload_encode_va(SilcCommand cmd,
  *
  *    SilcBuffer 
  *    silc_command_reply_payload_encode_vap(SilcCommand cmd, 
- *                                          SilcCommandStatus status,
- *                                          SilcCommandStatus error,
+ *                                          SilcStatus status,
+ *                                          SilcStatus error,
  *                                          SilcUInt16 ident, SilcUInt32 argc,
  *                                          va_list ap);
  *
@@ -376,8 +315,8 @@ silc_command_reply_payload_encode_va(SilcCommand cmd,
  ***/
 SilcBuffer 
 silc_command_reply_payload_encode_vap(SilcCommand cmd, 
-				      SilcCommandStatus status,
-				      SilcCommandStatus error,
+				      SilcStatus status,
+				      SilcStatus error,
 				      SilcUInt16 ident, SilcUInt32 argc, 
 				      va_list ap);
 
@@ -442,8 +381,8 @@ SilcUInt16 silc_command_get_ident(SilcCommandPayload payload);
  * SYNOPSIS
  *
  *    bool silc_command_get_status(SilcCommandPayload payload, 
- *                                 SilcCommandStatus *status,
- *                                 SilcCommandStatus *error);
+ *                                 SilcStatus *status,
+ *                                 SilcStatus *error);
  *
  * DESCRIPTION
  *
@@ -456,8 +395,8 @@ SilcUInt16 silc_command_get_ident(SilcCommandPayload payload);
  *
  ***/
 bool silc_command_get_status(SilcCommandPayload payload, 
-			     SilcCommandStatus *status,
-			     SilcCommandStatus *error);
+			     SilcStatus *status,
+			     SilcStatus *error);
 
 /****f* silccore/SilcCommandAPI/silc_command_set_ident
  *