diff options
| author | Pavel Roskin <plroskin@gmail.com> | 2016-04-21 23:03:40 -0700 |
|---|---|---|
| committer | Pavel Roskin <plroskin@gmail.com> | 2016-04-21 23:03:40 -0700 |
| commit | 95e1603f9dda52a7846ad454082712ce9a7aa75e (patch) | |
| tree | f3bcc5655884e24cb2d469d26402cddce6a34470 /sesman | |
| parent | 0629b25d5f406bad82f5bd0fa4894ae9667dc48e (diff) | |
| download | xrdp-proprietary-95e1603f9dda52a7846ad454082712ce9a7aa75e.tar.gz xrdp-proprietary-95e1603f9dda52a7846ad454082712ce9a7aa75e.zip | |
Fix recently introduced warnings in session.c
Use of tabs is fixed as well.
Diffstat (limited to 'sesman')
| -rw-r--r-- | sesman/session.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sesman/session.c b/sesman/session.c index 76eb264a..02bb6fa7 100644 --- a/sesman/session.c +++ b/sesman/session.c @@ -412,7 +412,7 @@ session_start_fork(int width, int height, int bpp, char *username, int pampid = 0; int xpid = 0; int i = 0; - char **xserver; /* absolute/relative path to Xorg/X11rdp/Xvnc */ + char *xserver; /* absolute/relative path to Xorg/X11rdp/Xvnc */ char geometry[32]; char depth[32]; char screen[32]; /* display number */ @@ -653,9 +653,9 @@ session_start_fork(int width, int height, int bpp, char *username, xserver_params = list_create(); xserver_params->auto_free = 1; - /* get path of Xorg from config */ - xserver = g_strdup(list_get_item(g_cfg->xorg_params, 0)); - list_remove_item(g_cfg->xorg_params, 0); + /* get path of Xorg from config */ + xserver = g_strdup((const char *)list_get_item(g_cfg->xorg_params, 0)); + list_remove_item(g_cfg->xorg_params, 0); /* these are the must have parameters */ list_add_item(xserver_params, (tintptr) g_strdup(xserver)); @@ -687,9 +687,9 @@ session_start_fork(int width, int height, int bpp, char *username, xserver_params = list_create(); xserver_params->auto_free = 1; - /* get path of Xvnc from config */ - xserver = g_strdup(list_get_item(g_cfg->vnc_params, 0)); - list_remove_item(g_cfg->vnc_params, 0); + /* get path of Xvnc from config */ + xserver = g_strdup((const char *)list_get_item(g_cfg->vnc_params, 0)); + list_remove_item(g_cfg->vnc_params, 0); /* these are the must have parameters */ list_add_item(xserver_params, (tintptr)g_strdup(xserver)); @@ -717,9 +717,9 @@ session_start_fork(int width, int height, int bpp, char *username, xserver_params = list_create(); xserver_params->auto_free = 1; - /* get path of X11rdp from config */ - xserver = g_strdup(list_get_item(g_cfg->rdp_params, 0)); - list_remove_item(g_cfg->rdp_params, 0); + /* get path of X11rdp from config */ + xserver = g_strdup((const char *)list_get_item(g_cfg->rdp_params, 0)); + list_remove_item(g_cfg->rdp_params, 0); /* these are the must have parameters */ list_add_item(xserver_params, (tintptr)g_strdup(xserver)); |