[svn:parrot] r37722 - in trunk: include/parrot src src/io
Infinoid at svn.parrot.org
Infinoid at svn.parrot.org
Wed Mar 25 17:56:55 UTC 2009
Author: Infinoid
Date: Wed Mar 25 17:56:55 2009
New Revision: 37722
URL: https://trac.parrot.org/parrot/changeset/37722
Log:
[cage] Add a headerizer location for socket_win32.c global functions to io_win32.h header. Rerun headerizer.
Modified:
trunk/include/parrot/extend.h
trunk/include/parrot/io_win32.h
trunk/src/debug.c
trunk/src/io/socket_win32.c
Modified: trunk/include/parrot/extend.h
==============================================================================
--- trunk/include/parrot/extend.h Wed Mar 25 17:56:51 2009 (r37721)
+++ trunk/include/parrot/extend.h Wed Mar 25 17:56:55 2009 (r37722)
@@ -419,9 +419,11 @@
PARROT_EXPORT
Parrot_PMC Parrot_sub_new_from_c_func(PARROT_INTERP,
- void (*func)(void),
- const char * signature)
- __attribute__nonnull__(1);
+ ARGIN(void (*func)(void)),
+ ARGIN(const char * signature))
+ __attribute__nonnull__(1)
+ __attribute__nonnull__(2)
+ __attribute__nonnull__(3);
PARROT_EXPORT
void Parrot_unregister_pmc(PARROT_INTERP, Parrot_PMC pmc)
@@ -566,7 +568,9 @@
#define ASSERT_ARGS_Parrot_set_strreg __attribute__unused__ int _ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp)
#define ASSERT_ARGS_Parrot_sub_new_from_c_func __attribute__unused__ int _ASSERT_ARGS_CHECK = \
- PARROT_ASSERT_ARG(interp)
+ PARROT_ASSERT_ARG(interp) \
+ || PARROT_ASSERT_ARG(func) \
+ || PARROT_ASSERT_ARG(signature)
#define ASSERT_ARGS_Parrot_unregister_pmc __attribute__unused__ int _ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp)
#define ASSERT_ARGS_Parrot_vfprintf __attribute__unused__ int _ASSERT_ARGS_CHECK = \
Modified: trunk/include/parrot/io_win32.h
==============================================================================
--- trunk/include/parrot/io_win32.h Wed Mar 25 17:56:51 2009 (r37721)
+++ trunk/include/parrot/io_win32.h Wed Mar 25 17:56:55 2009 (r37722)
@@ -135,6 +135,102 @@
|| PARROT_ASSERT_ARG(s)
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
/* HEADERIZER END: src/io/win32.c */
+/* HEADERIZER BEGIN: src/io/socket_win32.c */
+/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
+
+PARROT_WARN_UNUSED_RESULT
+PARROT_CAN_RETURN_NULL
+PMC * Parrot_io_accept_win32(PARROT_INTERP, ARGMOD(PMC *socket))
+ __attribute__nonnull__(1)
+ __attribute__nonnull__(2)
+ FUNC_MODIFIES(*socket);
+
+INTVAL Parrot_io_bind_win32(PARROT_INTERP,
+ ARGMOD(PMC *socket),
+ ARGMOD(PMC *sockaddr))
+ __attribute__nonnull__(1)
+ __attribute__nonnull__(2)
+ __attribute__nonnull__(3)
+ FUNC_MODIFIES(*socket)
+ FUNC_MODIFIES(*sockaddr);
+
+INTVAL Parrot_io_connect_win32(PARROT_INTERP,
+ ARGMOD(PMC *socket),
+ ARGIN(PMC *r))
+ __attribute__nonnull__(1)
+ __attribute__nonnull__(2)
+ __attribute__nonnull__(3)
+ FUNC_MODIFIES(*socket);
+
+INTVAL Parrot_io_listen_win32(SHIM_INTERP, ARGMOD(PMC *socket), INTVAL sec)
+ __attribute__nonnull__(2)
+ FUNC_MODIFIES(*socket);
+
+INTVAL Parrot_io_poll_win32(SHIM_INTERP,
+ ARGMOD(PMC *socket),
+ int which,
+ int sec,
+ int usec)
+ __attribute__nonnull__(2)
+ FUNC_MODIFIES(*socket);
+
+INTVAL Parrot_io_recv_win32(PARROT_INTERP,
+ ARGMOD(PMC *socket),
+ ARGOUT(STRING **s))
+ __attribute__nonnull__(1)
+ __attribute__nonnull__(2)
+ __attribute__nonnull__(3)
+ FUNC_MODIFIES(*socket)
+ FUNC_MODIFIES(*s);
+
+INTVAL Parrot_io_send_win32(SHIM_INTERP,
+ ARGMOD(PMC *socket),
+ ARGMOD(STRING *s))
+ __attribute__nonnull__(2)
+ __attribute__nonnull__(3)
+ FUNC_MODIFIES(*socket)
+ FUNC_MODIFIES(*s);
+
+PARROT_WARN_UNUSED_RESULT
+PARROT_CANNOT_RETURN_NULL
+PMC * Parrot_io_sockaddr_in(PARROT_INTERP, ARGIN(STRING *addr), INTVAL port)
+ __attribute__nonnull__(1)
+ __attribute__nonnull__(2);
+
+PARROT_WARN_UNUSED_RESULT
+PARROT_CAN_RETURN_NULL
+PMC * Parrot_io_socket_win32(PARROT_INTERP, int fam, int type, int proto)
+ __attribute__nonnull__(1);
+
+#define ASSERT_ARGS_Parrot_io_accept_win32 __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+ PARROT_ASSERT_ARG(interp) \
+ || PARROT_ASSERT_ARG(socket)
+#define ASSERT_ARGS_Parrot_io_bind_win32 __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+ PARROT_ASSERT_ARG(interp) \
+ || PARROT_ASSERT_ARG(socket) \
+ || PARROT_ASSERT_ARG(sockaddr)
+#define ASSERT_ARGS_Parrot_io_connect_win32 __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+ PARROT_ASSERT_ARG(interp) \
+ || PARROT_ASSERT_ARG(socket) \
+ || PARROT_ASSERT_ARG(r)
+#define ASSERT_ARGS_Parrot_io_listen_win32 __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+ PARROT_ASSERT_ARG(socket)
+#define ASSERT_ARGS_Parrot_io_poll_win32 __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+ PARROT_ASSERT_ARG(socket)
+#define ASSERT_ARGS_Parrot_io_recv_win32 __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+ PARROT_ASSERT_ARG(interp) \
+ || PARROT_ASSERT_ARG(socket) \
+ || PARROT_ASSERT_ARG(s)
+#define ASSERT_ARGS_Parrot_io_send_win32 __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+ PARROT_ASSERT_ARG(socket) \
+ || PARROT_ASSERT_ARG(s)
+#define ASSERT_ARGS_Parrot_io_sockaddr_in __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+ PARROT_ASSERT_ARG(interp) \
+ || PARROT_ASSERT_ARG(addr)
+#define ASSERT_ARGS_Parrot_io_socket_win32 __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+ PARROT_ASSERT_ARG(interp)
+/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
+/* HEADERIZER END: src/io/socket_win32.c */
#define PIO_INIT(interp) Parrot_io_init_win32((interp))
#define PIO_OPEN(interp, pmc, file, flags) \
Modified: trunk/src/debug.c
==============================================================================
--- trunk/src/debug.c Wed Mar 25 17:56:51 2009 (r37721)
+++ trunk/src/debug.c Wed Mar 25 17:56:55 2009 (r37722)
@@ -103,7 +103,9 @@
__attribute__nonnull__(1)
FUNC_MODIFIES(*cmd);
-static void list_breakpoints(PDB_t *pdb);
+static void list_breakpoints(ARGIN(PDB_t *pdb))
+ __attribute__nonnull__(1);
+
PARROT_CAN_RETURN_NULL
PARROT_WARN_UNUSED_RESULT
static const char * nextarg(ARGIN_NULLOK(const char *command));
@@ -166,7 +168,8 @@
PARROT_ASSERT_ARG(cmd)
#define ASSERT_ARGS_get_ulong __attribute__unused__ int _ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(cmd)
-#define ASSERT_ARGS_list_breakpoints __attribute__unused__ int _ASSERT_ARGS_CHECK = 0
+#define ASSERT_ARGS_list_breakpoints __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+ PARROT_ASSERT_ARG(pdb)
#define ASSERT_ARGS_nextarg __attribute__unused__ int _ASSERT_ARGS_CHECK = 0
#define ASSERT_ARGS_parse_int __attribute__unused__ int _ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(str) \
Modified: trunk/src/io/socket_win32.c
==============================================================================
--- trunk/src/io/socket_win32.c Wed Mar 25 17:56:51 2009 (r37721)
+++ trunk/src/io/socket_win32.c Wed Mar 25 17:56:55 2009 (r37722)
@@ -36,6 +36,18 @@
/* HEADERIZER BEGIN: static */
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
+static void get_sockaddr_in(PARROT_INTERP,
+ ARGIN(PMC * sockaddr),
+ ARGIN(const char* host),
+ int port)
+ __attribute__nonnull__(1)
+ __attribute__nonnull__(2)
+ __attribute__nonnull__(3);
+
+#define ASSERT_ARGS_get_sockaddr_in __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+ PARROT_ASSERT_ARG(interp) \
+ || PARROT_ASSERT_ARG(sockaddr) \
+ || PARROT_ASSERT_ARG(host)
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
/* HEADERIZER END: static */
More information about the parrot-commits
mailing list