awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed unused display variable. 

I just realized this variable was unused in the original code, and in my
patched version. I removed it.

Signed-off-by: Alex Cornejo <acornejo@gmail.com>
Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Alex Cornejo 2009-03-26 14:12:24 -04:00 committed by Julien Danjou
parent 07b8751ad9
commit 07d8168a45
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
awesome-client.c
View File

@ -44,7 +44,6 @@
struct sockaddr_un *addr; struct sockaddr_un *addr;
int csfd; int csfd;
char *display;
/** Initialize the client and server socket connections. /** Initialize the client and server socket connections.
* If something goes wrong, preserves errno. * If something goes wrong, preserves errno.
@ -56,7 +55,7 @@ sockets_init(void)
if((csfd = socket_getclient()) < 0) if((csfd = socket_getclient()) < 0)
return false; return false;
if(!(addr = socket_open(csfd, display, SOCKET_MODE_CONNECT))) if(!(addr = socket_open(csfd, SOCKET_MODE_CONNECT)))
return false; return false;
return true; return true;
@ -190,7 +189,7 @@ exit_help(int exit_code)
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
char buf[1024], *msg, *prompt; char buf[1024], *msg, *prompt, *display;
int ret_value = EXIT_SUCCESS; int ret_value = EXIT_SUCCESS;
ssize_t len, msg_len = 1; ssize_t len, msg_len = 1;

5
common/socket.c
View File

@ -33,14 +33,13 @@
#define CONTROL_UNIX_SOCKET_PATH ".awesome_ctl." #define CONTROL_UNIX_SOCKET_PATH ".awesome_ctl."
/** Open a communication socket with awesome for a given display. /** Open a communication socket with awesome.
* \param csfd The socket file descriptor. * \param csfd The socket file descriptor.
* \param display the display number
* \param mode The open mode, either Bind or Connect. * \param mode The open mode, either Bind or Connect.
* \return sockaddr_un Struct ready to be used or NULL if a problem ocurred. * \return sockaddr_un Struct ready to be used or NULL if a problem ocurred.
*/ */
struct sockaddr_un * struct sockaddr_un *
socket_open(int csfd, const char *display, const socket_mode_t mode) socket_open(int csfd, const socket_mode_t mode)
{ {
char *host = NULL; char *host = NULL;
int screenp = 0, displayp = 0; int screenp = 0, displayp = 0;

2
common/socket.h
View File

@ -28,7 +28,7 @@ typedef enum
SOCKET_MODE_CONNECT SOCKET_MODE_CONNECT
} socket_mode_t; } socket_mode_t;
struct sockaddr_un *socket_open(const int, const char *, const socket_mode_t); struct sockaddr_un *socket_open(const int, const socket_mode_t);
int socket_getclient(void); int socket_getclient(void);
#endif #endif

2
luaa.c
View File

@ -1115,7 +1115,7 @@ luaA_cs_init(void)
if (csfd < 0 || fcntl(csfd, F_SETFD, FD_CLOEXEC) == -1) if (csfd < 0 || fcntl(csfd, F_SETFD, FD_CLOEXEC) == -1)
return; return;
if(!(addr = socket_open(csfd, getenv("DISPLAY"), SOCKET_MODE_BIND))) if(!(addr = socket_open(csfd, SOCKET_MODE_BIND)))
{ {
warn("error binding UNIX domain socket: %s", strerror(errno)); warn("error binding UNIX domain socket: %s", strerror(errno));
return; return;