diff options
| author | Jay Sorg <jay.sorg@gmail.com> | 2012-05-12 19:34:43 -0700 |
|---|---|---|
| committer | Jay Sorg <jay.sorg@gmail.com> | 2012-05-12 19:34:43 -0700 |
| commit | bd8a75fa7ee417116f737081eec2ae3cdf3300a6 (patch) | |
| tree | f96e749d0a3c9ba23d76aa2049fbc3d16db778b0 /freerdp1 | |
| parent | c50425032c9da4950d41845c668e4056325e7737 (diff) | |
| download | xrdp-proprietary-bd8a75fa7ee417116f737081eec2ae3cdf3300a6.tar.gz xrdp-proprietary-bd8a75fa7ee417116f737081eec2ae3cdf3300a6.zip | |
freerdp1: coding style and ifdef change
Diffstat (limited to 'freerdp1')
| -rw-r--r-- | freerdp1/xrdp-freerdp.c | 106 |
1 files changed, 52 insertions, 54 deletions
diff --git a/freerdp1/xrdp-freerdp.c b/freerdp1/xrdp-freerdp.c index 2377f217..8e7aa3db 100644 --- a/freerdp1/xrdp-freerdp.c +++ b/freerdp1/xrdp-freerdp.c @@ -69,61 +69,59 @@ lxrdp_connect(struct mod* mod) if (!ok) { - LLOGLN(0, ("Failure to connect")); - if(connectErrorCode){ - char buf[128]; - if(connectErrorCode<ERRORSTART){ - if(strerror_r(connectErrorCode,buf,128)!=0){ - snprintf(buf,128,"Errorcode from connect : %d",connectErrorCode); - } - }else{ - switch(connectErrorCode){ - case PREECONNECTERROR:{ - snprintf(buf,128,"The error code from connect is PREECONNECTERROR"); - break ; - } - case UNDEFINEDCONNECTERROR:{ - snprintf(buf,128,"The error code from connect is UNDEFINEDCONNECTERROR"); - break ; - } - case POSTCONNECTERROR:{ - snprintf(buf,128,"The error code from connect is POSTCONNECTERROR"); - break ; - } - case DNSERROR:{ - snprintf(buf,128,"The DNS system generated an error"); - break ; - } - case DNSNAMENOTFOUND:{ - snprintf(buf,128,"The DNS system could not find the specified name"); - break ; - } - case CONNECTERROR:{ - snprintf(buf,128,"A general connect error was returned"); - break ; - } - case MCSCONNECTINITIALERROR:{ - snprintf(buf,128,"The error code from connect is MCSCONNECTINITIALERROR"); - break ; - } - case TLSCONNECTERROR:{ - snprintf(buf,128,"Error in TLS handshake"); - break ; - } - case AUTHENTICATIONERROR:{ - snprintf(buf,128,"Authentication error check your password and username"); - break ; - } - - default:{ - snprintf(buf,128,"Unhandled Errorcode from connect : %d",connectErrorCode); - break ; - } - } - } - mod->server_msg(mod,buf,0); + LLOGLN(0, ("Failure to connect")); +#ifdef ERRORSTART + if (connectErrorCode != 0) + { + char buf[128]; + + if (connectErrorCode < ERRORSTART) + { + if (strerror_r(connectErrorCode, buf, 128) != 0) + { + snprintf(buf, 128, "Errorcode from connect : %d", connectErrorCode); + } } - return 1; + else + { + switch (connectErrorCode) + { + case PREECONNECTERROR: + snprintf(buf, 128, "The error code from connect is PREECONNECTERROR"); + break; + case UNDEFINEDCONNECTERROR: + snprintf(buf, 128, "The error code from connect is UNDEFINEDCONNECTERROR"); + break; + case POSTCONNECTERROR: + snprintf(buf, 128, "The error code from connect is POSTCONNECTERROR"); + break; + case DNSERROR: + snprintf(buf, 128, "The DNS system generated an error"); + break; + case DNSNAMENOTFOUND: + snprintf(buf, 128, "The DNS system could not find the specified name"); + break; + case CONNECTERROR: + snprintf(buf, 128, "A general connect error was returned"); + break; + case MCSCONNECTINITIALERROR: + snprintf(buf, 128, "The error code from connect is MCSCONNECTINITIALERROR"); + break; + case TLSCONNECTERROR: + snprintf(buf, 128, "Error in TLS handshake"); + break; + case AUTHENTICATIONERROR: + snprintf(buf, 128, "Authentication error check your password and username"); + break; + default: + snprintf(buf, 128, "Unhandled Errorcode from connect : %d", connectErrorCode); + break; + } + } + mod->server_msg(mod, buf, 0); + } +#endif + return 1; } return 0; } |