diff --git a/ZCppMain/ZMainEnc.H b/ZCppMain/ZMainEnc.H index baa6713..f1017a6 100644 --- a/ZCppMain/ZMainEnc.H +++ b/ZCppMain/ZMainEnc.H @@ -64,7 +64,7 @@ namespace ZNsMain if(APC_Origin==0 || VPC_Encode==0) return ARR_CStringEnc; - ////////////////////////////////// + /*++++++++++++++++++++++++++++++*/ for(i = j = 0; APC_Origin[i]; i++) { @@ -92,12 +92,12 @@ namespace ZNsMain ///////////////////////////////////////////////////////////*/ - if((c >= '0') && (c <= '9')) VPC_Encode[j++] = c; - else if((c >= 'A') && (c <= 'Z')) VPC_Encode[j++] = c; - else if((c >= 'a') && (c <= 'z')) VPC_Encode[j++] = c; + if ((c >= '0') && (c <= '9')) VPC_Encode[j++] = c; + else if((c >= 'A') && (c <= 'Z')) VPC_Encode[j++] = c; + else if((c >= 'a') && (c <= 'z')) VPC_Encode[j++] = c; else if((c == '@') || (c == '.') || (c == '/') || (c == '-') || (c == '_') || (c == ':') ) - VPC_Encode[j++] = c; + VPC_Encode[j++] = c; else if(c == '\\') { VPC_Encode[j++] = '%'; @@ -110,9 +110,10 @@ namespace ZNsMain else { ::sprintf(VCA_Buff, "%02x", c); - VPC_Encode[j++] = '%'; - VPC_Encode[j++] = VCA_Buff[0]; - VPC_Encode[j++] = VCA_Buff[1]; + + VPC_Encode[j++] = '%' ; + VPC_Encode[j++] = VCA_Buff[0] ; + VPC_Encode[j++] = VCA_Buff[1] ; }/* else*/ }/* @@ -1224,7 +1225,7 @@ namespace ZNsMain for(int i=1; i<=VI_ArrSize; ++i)*/ - if(VI_LoopCnt+AI_Offset - static void Encode(const char* APC_Origin, long AL_Length, TString& ARR_CStringEnc) + template static void Encode + (const char* APC_Origin, long AL_Length, TString& ARR_CStringEnc) { ZNsMain::ZNsEnc::ZftGetBase64Enc((const unsigned char*)APC_Origin, AL_Length, RR(ARR_CStringEnc)); }/* - template - static void Encode(const char* APC_Origin, long AL_Length, TString& ARR_CStringEnc) */ + template static void Encode + (const char* APC_Origin, long AL_Length, TString& ARR_CStringEnc) */ - template - static void Encode(const TString& ARR_CStringOri, TString& ARR_CStringEnc) + template static void Encode + (const TString& ARR_CStringOri, TString& ARR_CStringEnc) { Encode(ARR_CStringOri.data(), ARR_CStringOri.size(), RR(ARR_CStringEnc)); }/* - template - static void Encode(const TString& ARR_CStringOri, TString& ARR_CStringEnc) */ + template static void Encode + (const TString& ARR_CStringOri, TString& ARR_CStringEnc) */ - template - static void Decode(const char* APC_Origin, long AL_Length, TString& ARR_CStringDec) + template static void Decode + (const char* APC_Origin, long AL_Length, TString& ARR_CStringDec) { - ZNsMain::ZNsEnc::ZftGetBase64Dec((const unsigned char*)APC_Origin, AL_Length, RR(ARR_CStringDec)); + ZNsMain::ZNsEnc::ZftGetBase64Dec + ((const unsigned char*)APC_Origin, AL_Length, RR(ARR_CStringDec)); }/* - template - static void Decode(const char* APC_Origin, long AL_Length, TString& ARR_CStringDec) */ + template static void Decode + (const char* APC_Origin, long AL_Length, TString& ARR_CStringDec) */ - template - static void Decode(const TString& ARR_CStringOri, TString& ARR_CStringDec) + template static void Decode + (const TString& ARR_CStringOri, TString& ARR_CStringDec) { Decode(ARR_CStringOri.data(), ARR_CStringOri.size(), RR(ARR_CStringDec)); }/* - template - static void Decode(const TString& ARR_CStringOri, TString& ARR_CStringDec) */ + template static void Decode + (const TString& ARR_CStringOri, TString& ARR_CStringDec) */ public: };/* @@ -1420,9 +1422,10 @@ namespace ZNsMain enum EResult*/ public : - enum{ESHA1HashSize = 20}; + enum{ ESHA1HashSize = 20 } ; public : - typedef uint8_t UInt8Digest[ESHA1HashSize]; + typedef uint8_t + UInt8Digest[ESHA1HashSize]; private: struct StContext