summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
80629c8)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6775
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
* -------------------------------------------------------------------------
*/
* -------------------------------------------------------------------------
*/
-/* CHECK_ADDRESS verifies that the current family is either GSOCK_NOFAMILY
- * or GSOCK_*family*, and if it is GSOCK_NOFAMILY, it initalizes address
- * to be a GSOCK_*family*. In other cases, it returns GSOCK_INVADDR.
+/* CHECK_ADDRESS verifies that the current address family is either
+ * GSOCK_NOFAMILY or GSOCK_*family*, and if it is GSOCK_NOFAMILY, it
+ * initalizes it to be a GSOCK_*family*. In other cases, it returns
+ * an appropiate error code.
+ *
+ * CHECK_ADDRESS_RETVAL does the same but returning 'retval' on error.
-#define CHECK_ADDRESS(address, family, retval) \
+#define CHECK_ADDRESS(address, family) \
{ \
if (address->m_family == GSOCK_NOFAMILY) \
if (_GAddress_Init_##family(address) != GSOCK_NOERROR) \
return address->m_error; \
if (address->m_family != GSOCK_##family) \
{ \
if (address->m_family == GSOCK_NOFAMILY) \
if (_GAddress_Init_##family(address) != GSOCK_NOERROR) \
return address->m_error; \
if (address->m_family != GSOCK_##family) \
+ { \
+ address->m_error = GSOCK_INVADDR; \
+ return GSOCK_INVADDR; \
+ } \
+}
+
+#define CHECK_ADDRESS_RETVAL(address, family, retval) \
+{ \
+ if (address->m_family == GSOCK_NOFAMILY) \
+ if (_GAddress_Init_##family(address) != GSOCK_NOERROR) \
+ return retval; \
+ if (address->m_family != GSOCK_##family) \
{ \
address->m_error = GSOCK_INVADDR; \
return retval; \
} \
}
{ \
address->m_error = GSOCK_INVADDR; \
return retval; \
} \
}
GAddress *GAddress_new(void)
{
GAddress *address;
GAddress *GAddress_new(void)
{
GAddress *address;
- CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
+ CHECK_ADDRESS(address, INET);
addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);
addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);
- CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
+ CHECK_ADDRESS(address, INET);
addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);
addr->s_addr = hostaddr;
addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);
addr->s_addr = hostaddr;
struct sockaddr_in *addr;
assert(address != NULL);
struct sockaddr_in *addr;
assert(address != NULL);
- CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
+ CHECK_ADDRESS(address, INET);
struct sockaddr_in *addr;
assert(address != NULL);
struct sockaddr_in *addr;
assert(address != NULL);
- CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
+ CHECK_ADDRESS(address, INET);
addr = (struct sockaddr_in *)address->m_addr;
addr->sin_port = htons(port);
addr = (struct sockaddr_in *)address->m_addr;
addr->sin_port = htons(port);
struct sockaddr_in *addr;
assert(address != NULL);
struct sockaddr_in *addr;
assert(address != NULL);
- CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
+ CHECK_ADDRESS(address, INET);
addr = (struct sockaddr_in *)address->m_addr;
addr_buf = (char *)&(addr->sin_addr);
addr = (struct sockaddr_in *)address->m_addr;
addr_buf = (char *)&(addr->sin_addr);
struct sockaddr_in *addr;
assert(address != NULL);
struct sockaddr_in *addr;
assert(address != NULL);
- CHECK_ADDRESS(address, INET, 0);
+ CHECK_ADDRESS_RETVAL(address, INET, 0);
addr = (struct sockaddr_in *)address->m_addr;
addr = (struct sockaddr_in *)address->m_addr;
struct sockaddr_in *addr;
assert(address != NULL);
struct sockaddr_in *addr;
assert(address != NULL);
- CHECK_ADDRESS(address, INET, 0);
+ CHECK_ADDRESS_RETVAL(address, INET, 0);
addr = (struct sockaddr_in *)address->m_addr;
return ntohs(addr->sin_port);
addr = (struct sockaddr_in *)address->m_addr;
return ntohs(addr->sin_port);
/* debugging helpers */
#ifdef __GSOCKET_DEBUG__
/* debugging helpers */
#ifdef __GSOCKET_DEBUG__
- #define GSocket_Debug(args) printf args
+# define GSocket_Debug(args) printf args
- #define GSocket_Debug(args)
-#endif // __GSOCKET_DEBUG__
+# define GSocket_Debug(args)
+#endif /* __GSOCKET_DEBUG__ */
/* Global initialisers */
/* Global initialisers */
* -------------------------------------------------------------------------
*/
* -------------------------------------------------------------------------
*/
-/* CHECK_ADDRESS verifies that the current family is either GSOCK_NOFAMILY
- * or GSOCK_*family*, and if it is GSOCK_NOFAMILY, it initalizes address
- * to be a GSOCK_*family*. In other cases, it returns GSOCK_INVADDR.
+/* CHECK_ADDRESS verifies that the current address family is either
+ * GSOCK_NOFAMILY or GSOCK_*family*, and if it is GSOCK_NOFAMILY, it
+ * initalizes it to be a GSOCK_*family*. In other cases, it returns
+ * an appropiate error code.
+ *
+ * CHECK_ADDRESS_RETVAL does the same but returning 'retval' on error.
-#define CHECK_ADDRESS(address, family, retval) \
+#define CHECK_ADDRESS(address, family) \
{ \
if (address->m_family == GSOCK_NOFAMILY) \
if (_GAddress_Init_##family(address) != GSOCK_NOERROR) \
return address->m_error; \
if (address->m_family != GSOCK_##family) \
{ \
if (address->m_family == GSOCK_NOFAMILY) \
if (_GAddress_Init_##family(address) != GSOCK_NOERROR) \
return address->m_error; \
if (address->m_family != GSOCK_##family) \
+ { \
+ address->m_error = GSOCK_INVADDR; \
+ return GSOCK_INVADDR; \
+ } \
+}
+
+#define CHECK_ADDRESS_RETVAL(address, family, retval) \
+{ \
+ if (address->m_family == GSOCK_NOFAMILY) \
+ if (_GAddress_Init_##family(address) != GSOCK_NOERROR) \
+ return retval; \
+ if (address->m_family != GSOCK_##family) \
{ \
address->m_error = GSOCK_INVADDR; \
return retval; \
} \
}
{ \
address->m_error = GSOCK_INVADDR; \
return retval; \
} \
}
GAddress *GAddress_new(void)
{
GAddress *address;
GAddress *GAddress_new(void)
{
GAddress *address;
*len = address->m_len;
*addr = (struct sockaddr *)malloc(address->m_len);
*len = address->m_len;
*addr = (struct sockaddr *)malloc(address->m_len);
address->m_error = GSOCK_MEMERR;
return GSOCK_MEMERR;
}
address->m_error = GSOCK_MEMERR;
return GSOCK_MEMERR;
}
- CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
+ CHECK_ADDRESS(address, INET);
addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);
addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);
- CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
+ CHECK_ADDRESS(address, INET);
addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);
addr->s_addr = hostaddr;
addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);
addr->s_addr = hostaddr;
struct sockaddr_in *addr;
assert(address != NULL);
struct sockaddr_in *addr;
assert(address != NULL);
- CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
+ CHECK_ADDRESS(address, INET);
struct sockaddr_in *addr;
assert(address != NULL);
struct sockaddr_in *addr;
assert(address != NULL);
- CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
+ CHECK_ADDRESS(address, INET);
addr = (struct sockaddr_in *)address->m_addr;
addr->sin_port = htons(port);
addr = (struct sockaddr_in *)address->m_addr;
addr->sin_port = htons(port);
struct sockaddr_in *addr;
assert(address != NULL);
struct sockaddr_in *addr;
assert(address != NULL);
- CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
+ CHECK_ADDRESS(address, INET);
addr = (struct sockaddr_in *)address->m_addr;
addr_buf = (char *)&(addr->sin_addr);
addr = (struct sockaddr_in *)address->m_addr;
addr_buf = (char *)&(addr->sin_addr);
struct sockaddr_in *addr;
assert(address != NULL);
struct sockaddr_in *addr;
assert(address != NULL);
- CHECK_ADDRESS(address, INET, 0);
+ CHECK_ADDRESS_RETVAL(address, INET, 0);
addr = (struct sockaddr_in *)address->m_addr;
addr = (struct sockaddr_in *)address->m_addr;
struct sockaddr_in *addr;
assert(address != NULL);
struct sockaddr_in *addr;
assert(address != NULL);
- CHECK_ADDRESS(address, INET, 0);
+ CHECK_ADDRESS_RETVAL(address, INET, 0);
addr = (struct sockaddr_in *)address->m_addr;
return ntohs(addr->sin_port);
addr = (struct sockaddr_in *)address->m_addr;
return ntohs(addr->sin_port);
((struct sockaddr_un *)address->m_addr)->sun_family = AF_UNIX;
((struct sockaddr_un *)address->m_addr)->sun_path[0] = 0;
((struct sockaddr_un *)address->m_addr)->sun_family = AF_UNIX;
((struct sockaddr_un *)address->m_addr)->sun_path[0] = 0;
}
GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path)
}
GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path)
- CHECK_ADDRESS(address, UNIX, GSOCK_INVADDR);
+ CHECK_ADDRESS(address, UNIX);
addr = ((struct sockaddr_un *)address->m_addr);
memcpy(addr->sun_path, path, strlen(path));
addr = ((struct sockaddr_un *)address->m_addr);
memcpy(addr->sun_path, path, strlen(path));
struct sockaddr_un *addr;
assert(address != NULL);
struct sockaddr_un *addr;
assert(address != NULL);
- CHECK_ADDRESS(address, UNIX, GSOCK_INVADDR);
+ CHECK_ADDRESS(address, UNIX);
addr = (struct sockaddr_un *)address->m_addr;
addr = (struct sockaddr_un *)address->m_addr;