mirrors/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #485 from proski/code-standards

Browse Source 
Code standards
This commit is contained in:
metalefty 2016-11-16 17:05:21 +09:00 committed by GitHub
commit b89956d06e
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sesman/chansrv/chansrv.c
View File

@ -1400,20 +1400,20 @@ get_log_path()
log_path = g_getenv("XDG_DATA_HOME");
if (log_path != 0)
{
cp = malloc(strlen(log_path) + strlen("/xrdp") + 1);
cp = g_new(char, strlen(log_path) + strlen("/xrdp") + 1);
if (cp != 0)
{
memcpy(cp, log_path, strlen(log_path));
memcpy(cp + strlen(log_path), "/xrdp", strlen("/xrdp") + 1);
if (g_directory_exist(cp) || g_mkdir(cp))
{
{
log_path = cp;
}
}
else
{
{
free(cp);
}
}
}
}
}
@ -1423,7 +1423,7 @@ get_log_path()
log_path = g_getenv("HOME");
if (log_path != 0)
{
cp = malloc(strlen(log_path) + strlen("/.local/share/xrdp") + 1);
cp = g_new(char, strlen(log_path) + strlen("/.local/share/xrdp") + 1);
if (cp != 0)
{

4
sesman/chansrv/pcsc/wrapper/winscard-funcs.h
View File

@ -107,7 +107,7 @@ typedef LONG WINAPI
(*tSCardFreeMemory)(SCARDCONTEXT hContext, LPCVOID pvMem);
typedef LONG WINAPI
(*tSCardLocateCardsA)(SCARDCONTEXT hContext, LPCSTR mszCards,
LPSCARD_READERSTATEA rgReaderStates, DWORD cReaders);
LPSCARD_READERSTATEA rgReaderStates, DWORD cReaders);
typedef LONG WINAPI
(*tSCardLocateCardsW)(SCARDCONTEXT hContext, LPCWSTR mszCards,
LPSCARD_READERSTATEW rgReaderStates, DWORD cReaders);
@ -160,7 +160,7 @@ typedef LONG WINAPI
typedef LONG WINAPI
(*tSCardControl)(SCARDHANDLE hCard, DWORD dwControlCode, LPCVOID lpInBuffer,
DWORD nInBufferSize, LPVOID lpOutBuffer,
DWORD nOutBufferSize, LPDWORD lpBytesReturned);
DWORD nOutBufferSize, LPDWORD lpBytesReturned);
typedef LONG WINAPI
(*tSCardGetAttrib)(SCARDHANDLE hCard, DWORD dwAttrId, LPBYTE pbAttr,
LPDWORD pcbAttrLen);

2
xrdp/xrdp_types.h
View File

@ -592,7 +592,7 @@ struct xrdp_cfg_globals
int ls_btn_cancel_y_pos; /* y pos for Cancel button */
int ls_btn_cancel_width; /* width of Cancel button */
int ls_btn_cancel_height; /* height of Cancel button */
char ls_title[256]; /* loginscreen window title */
char ls_title[256]; /* loginscreen window title */
};
struct xrdp_cfg_logging