[Development] Define security types as rdr::U8 values.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4034 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/common/rfb/Security.cxx b/common/rfb/Security.cxx
index 830d844..67acf5c 100644
--- a/common/rfb/Security.cxx
+++ b/common/rfb/Security.cxx
@@ -22,7 +22,7 @@
#include <rfb/secTypes.h>
#include <rfb/util.h>
-int rfb::secTypeNum(const char* name)
+rdr::U8 rfb::secTypeNum(const char* name)
{
if (strcasecmp(name, "None") == 0) return secTypeNone;
if (strcasecmp(name, "VncAuth") == 0) return secTypeVncAuth;
@@ -34,7 +34,7 @@
return secTypeInvalid;
}
-const char* rfb::secTypeName(int num)
+const char* rfb::secTypeName(rdr::U8 num)
{
switch (num) {
case secTypeNone: return "None";
@@ -48,7 +48,7 @@
}
}
-bool rfb::secTypeEncrypts(int num)
+bool rfb::secTypeEncrypts(rdr::U8 num)
{
switch (num) {
case secTypeRA2:
@@ -59,13 +59,13 @@
}
}
-std::list<int> rfb::parseSecTypes(const char* types_)
+std::list<rdr::U8> rfb::parseSecTypes(const char* types_)
{
- std::list<int> result;
+ std::list<rdr::U8> result;
CharArray types(strDup(types_)), type;
while (types.buf) {
strSplit(types.buf, ',', &type.buf, &types.buf);
- int typeNum = secTypeNum(type.buf);
+ rdr::U8 typeNum = secTypeNum(type.buf);
if (typeNum != secTypeInvalid)
result.push_back(typeNum);
}