From 9193bdcc250ca8527cb37bbd7d7336ebef3de6df Mon Sep 17 00:00:00 2001
From: "Vladimir A. Nosenko" <nosenko@nicetu.spb.ru>
Date: Mon, 31 Jan 2011 18:02:08 +0300
Subject: [PATCH] new errType enum err_not_allowed rcsCmd::encode BYTE* ->
 void*

---
 extra/ortsTypes/ortsTypes.cpp | 5 +++--
 extra/ortsTypes/ortsTypes.h   | 3 ++-
 rcsLib/rcsCmd/rcsCmd.cpp      | 4 ++--
 rcsLib/rcsCmd/rcsCmd.h        | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/extra/ortsTypes/ortsTypes.cpp b/extra/ortsTypes/ortsTypes.cpp
index 836e022..d3984ec 100644
--- a/extra/ortsTypes/ortsTypes.cpp
+++ b/extra/ortsTypes/ortsTypes.cpp
@@ -1,4 +1,4 @@
-char strErrTypes[12][255]=
+char strErrTypes[13][255]=
        {{"Успешно"},			//
        {"Ошибка исполнения"},
        {"Ошибка контрольной суммы"},
@@ -10,7 +10,8 @@ char strErrTypes[12][255]=
        {"Выполнение прервано"},
        {"Ошибка выделения памяти"},
        {"Ошибка доступа к сокету"},
-       {"Не найден"}};
+       {"Не найден"},
+       {"Операция не разрешена"}};
 
 char lenOrtsTypes[20]={
 		1,//size of element of type_ERRTYPE
diff --git a/extra/ortsTypes/ortsTypes.h b/extra/ortsTypes/ortsTypes.h
index ed1092c..950943d 100644
--- a/extra/ortsTypes/ortsTypes.h
+++ b/extra/ortsTypes/ortsTypes.h
@@ -33,7 +33,8 @@ typedef enum {err_result_ok=0,
               err_abort=8,
               err_mem_alloc=9,
               err_sock_error=10,
-              err_not_found=11} errType;
+              err_not_found=11,
+              err_not_allowed=12} errType;
               
 extern char strErrTypes[][255];
 extern BYTE lenOrtsTypes[];
diff --git a/rcsLib/rcsCmd/rcsCmd.cpp b/rcsLib/rcsCmd/rcsCmd.cpp
index ad6b6fb..85a10f4 100644
--- a/rcsLib/rcsCmd/rcsCmd.cpp
+++ b/rcsLib/rcsCmd/rcsCmd.cpp
@@ -186,7 +186,7 @@ errType rcsCmd::pushParam(OrtsType type, const void* param)
 	return result;
 }
 
-errType rcsCmd::encode(BYTE func_num, DWORD par_length, const BYTE* data)
+errType rcsCmd::encode(BYTE func_num, DWORD par_length, const void* data)
 {
 	errType result=err_not_init;
 	
@@ -261,4 +261,4 @@ bool rcsCmd::checkSign()
 //  */  
     if (test_sign==get_crc_sign()) result=true;
     return result;
-}
\ No newline at end of file
+}
diff --git a/rcsLib/rcsCmd/rcsCmd.h b/rcsLib/rcsCmd/rcsCmd.h
index 1484734..a26d212 100644
--- a/rcsLib/rcsCmd/rcsCmd.h
+++ b/rcsLib/rcsCmd/rcsCmd.h
@@ -33,7 +33,7 @@ class rcsCmd {
  const void* popParam(OrtsType);
  
  errType encode(const BYTE* dataBlock);
- errType encode(BYTE funcId, DWORD len=0, const BYTE* data=0);
+ errType encode(BYTE funcId, DWORD len=0, const void* data=0);
  
  
  errType makeSign();