On Fri, 30 Jul 2010, Enlightenment SVN wrote:
> Log:
> rrrrrrrrrrrrrr stupid enum!
why don't you fix the enum instead ?
Vincent
>
> Author: discomfitor
> Date: 2010-07-30 10:03:34 -0700 (Fri, 30 Jul 2010)
> New Revision: 50689
>
> Modified:
> trunk/ecore/src/lib/ecore_con/ecore_con.c
> trunk/ecore/src/lib/ecore_con/ecore_con_local.c
>
> Modified: trunk/ecore/src/lib/ecore_con/ecore_con.c
> ===================================================================
> --- trunk/ecore/src/lib/ecore_con/ecore_con.c 2010-07-30 15:57:19 UTC (rev
> 50688)
> +++ trunk/ecore/src/lib/ecore_con/ecore_con.c 2010-07-30 17:03:34 UTC (rev
> 50689)
> @@ -708,7 +708,7 @@
> ecore_main_fd_handler_active_set(
> cl->fd_handler, ECORE_FD_READ | ECORE_FD_WRITE);
>
> - if(cl->server && cl->server->type == ECORE_CON_REMOTE_UDP)
> + if(cl->server && ((cl->server->type & ECORE_CON_TYPE) ==
> ECORE_CON_REMOTE_UDP))
> sendto(cl->server->fd, data, size, 0, (struct sockaddr
> *)cl->client_addr,
> cl->client_addr_len);
> else if (cl->buf)
> @@ -1116,7 +1116,7 @@
> sizeof(struct linger)) < 0)
> goto error;
>
> - if (svr->type == ECORE_CON_REMOTE_NODELAY)
> + if ((svr->type & ECORE_CON_TYPE) == ECORE_CON_REMOTE_NODELAY)
> {
> int flag = 1;
>
> @@ -1248,7 +1248,7 @@
> sizeof(curstate)) < 0)
> goto error;
>
> - if (svr->type == ECORE_CON_REMOTE_NODELAY)
> + if ((svr->type & ECORE_CON_TYPE) == ECORE_CON_REMOTE_NODELAY)
> {
> int flag = 1;
>
> @@ -1319,7 +1319,7 @@
> if (fcntl(svr->fd, F_SETFD, FD_CLOEXEC) < 0)
> goto error;
>
> - if(svr->type == ECORE_CON_REMOTE_BROADCAST)
> + if ((svr->type & ECORE_CON_TYPE) == ECORE_CON_REMOTE_BROADCAST)
> {
> if (setsockopt(svr->fd, SOL_SOCKET, SO_BROADCAST,
> (const void *)&broadcast,
>
> Modified: trunk/ecore/src/lib/ecore_con/ecore_con_local.c
> ===================================================================
> --- trunk/ecore/src/lib/ecore_con/ecore_con_local.c 2010-07-30 15:57:19 UTC
> (rev 50688)
> +++ trunk/ecore/src/lib/ecore_con/ecore_con_local.c 2010-07-30 17:03:34 UTC
> (rev 50689)
> @@ -77,7 +77,7 @@
> const char *homedir;
> int socket_unix_len;
>
> - if (svr->type == ECORE_CON_LOCAL_USER)
> + if ((svr->type & ECORE_CON_TYPE) == ECORE_CON_LOCAL_USER)
> {
> homedir = getenv("HOME");
> if (!homedir)
> @@ -89,7 +89,7 @@
> snprintf(buf, sizeof(buf), "%s/.ecore/%s/%i", homedir, svr->name,
> svr->port);
> }
> - else if (svr->type == ECORE_CON_LOCAL_SYSTEM)
> + else if ((svr->type & ECORE_CON_TYPE) == ECORE_CON_LOCAL_SYSTEM)
> {
> if (svr->port < 0)
> {
> @@ -110,7 +110,7 @@
> svr->port);
> }
> }
> - else if (svr->type == ECORE_CON_LOCAL_ABSTRACT)
> + else if ((svr->type & ECORE_CON_TYPE) == ECORE_CON_LOCAL_ABSTRACT)
> strncpy(buf, svr->name,
> sizeof(buf));
>
> @@ -130,7 +130,7 @@
>
> socket_unix.sun_family = AF_UNIX;
>
> - if (svr->type == ECORE_CON_LOCAL_ABSTRACT)
> + if ((svr->type & ECORE_CON_TYPE) == ECORE_CON_LOCAL_ABSTRACT)
> {
> #ifdef HAVE_ABSTRACT_SOCKETS
> /* copy name insto sun_path, prefixed by null to indicate abstract
> namespace */
> @@ -206,7 +206,7 @@
>
> mask = S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IWOTH | S_IXOTH;
>
> - if (svr->type == ECORE_CON_LOCAL_USER)
> + if ((svr->type & ECORE_CON_TYPE) == ECORE_CON_LOCAL_USER)
> {
> homedir = getenv("HOME");
> if (!homedir)
> @@ -232,7 +232,7 @@
> svr->port);
> mask = S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IWOTH | S_IXOTH;
> }
> - else if (svr->type == ECORE_CON_LOCAL_SYSTEM)
> + else if ((svr->type & ECORE_CON_TYPE) == ECORE_CON_LOCAL_SYSTEM)
> {
> mask = 0;
> if (svr->name[0] == '/')
> @@ -256,7 +256,7 @@
> svr->name,
> svr->port);
> }
> - else if (svr->type == ECORE_CON_LOCAL_ABSTRACT)
> + else if ((svr->type & ECORE_CON_TYPE) == ECORE_CON_LOCAL_ABSTRACT)
> strncpy(buf, svr->name,
> sizeof(buf));
>
> @@ -279,7 +279,7 @@
> goto error_umask;
>
> socket_unix.sun_family = AF_UNIX;
> - if (svr->type == ECORE_CON_LOCAL_ABSTRACT)
> + if ((svr->type & ECORE_CON_TYPE) == ECORE_CON_LOCAL_ABSTRACT)
> {
> #ifdef HAVE_ABSTRACT_SOCKETS
> /* . is a placeholder */
> @@ -302,8 +302,8 @@
>
> if (bind(svr->fd, (struct sockaddr *)&socket_unix, socket_unix_len) < 0)
> {
> - if (((svr->type == ECORE_CON_LOCAL_USER) ||
> - (svr->type == ECORE_CON_LOCAL_SYSTEM)) &&
> + if ((((svr->type & ECORE_CON_TYPE) == ECORE_CON_LOCAL_USER) ||
> + ((svr->type & ECORE_CON_TYPE) == ECORE_CON_LOCAL_SYSTEM)) &&
> (connect(svr->fd, (struct sockaddr *)&socket_unix,
> socket_unix_len) < 0) &&
> (unlink(buf) >= 0))
>
>
> ------------------------------------------------------------------------------
> The Palm PDK Hot Apps Program offers developers who use the
> Plug-In Development Kit to bring their C/C++ apps to Palm for a share
> of $1 Million in cash or HP Products. Visit us here for more details:
> http://p.sf.net/sfu/dev2dev-palm
> _______________________________________________
> enlightenment-svn mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/enlightenment-svn
>
>
------------------------------------------------------------------------------
The Palm PDK Hot Apps Program offers developers who use the
Plug-In Development Kit to bring their C/C++ apps to Palm for a share
of $1 Million in cash or HP Products. Visit us here for more details:
http://p.sf.net/sfu/dev2dev-palm
_______________________________________________
enlightenment-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
