Commit eb4be07d authored by Pekka Pessi's avatar Pekka Pessi

Not using SU_MSG_RINITIALIZER anymore.

Fixed nta/nta.c, nth/nth_client.c, su/su_root.c.

darcs-hash:20060503135724-65a35-d79fb707e8eee428cbf09f5513a3bdffe6c11429.gz
parent 87e639f1
...@@ -5781,7 +5781,7 @@ int incoming_mass_destroy(nta_agent_t *sa, incoming_queue_t *q) ...@@ -5781,7 +5781,7 @@ int incoming_mass_destroy(nta_agent_t *sa, incoming_queue_t *q)
unsigned destroyed = q->q_length; unsigned destroyed = q->q_length;
if (destroyed > 2 && *sa->sa_terminator) { if (destroyed > 2 && *sa->sa_terminator) {
su_msg_r m = SU_MSG_RINITIALIZER; su_msg_r m = SU_MSG_R_INIT;
if (su_msg_create(m, if (su_msg_create(m,
su_clone_task(sa->sa_terminator), su_clone_task(sa->sa_terminator),
...@@ -7428,7 +7428,7 @@ int outgoing_mass_destroy(nta_agent_t *sa, outgoing_queue_t *q) ...@@ -7428,7 +7428,7 @@ int outgoing_mass_destroy(nta_agent_t *sa, outgoing_queue_t *q)
int destroyed = q->q_length; int destroyed = q->q_length;
if (destroyed > 2 && *sa->sa_terminator) { if (destroyed > 2 && *sa->sa_terminator) {
su_msg_r m = SU_MSG_RINITIALIZER; su_msg_r m = SU_MSG_R_INIT;
if (su_msg_create(m, if (su_msg_create(m,
su_clone_task(sa->sa_terminator), su_clone_task(sa->sa_terminator),
...@@ -7992,7 +7992,7 @@ int outgoing_reply(nta_outgoing_t *orq, int status, char const *phrase, ...@@ -7992,7 +7992,7 @@ int outgoing_reply(nta_outgoing_t *orq, int status, char const *phrase,
*/ */
nta_agent_t *agent = orq->orq_agent; nta_agent_t *agent = orq->orq_agent;
su_root_t *root = agent->sa_root; su_root_t *root = agent->sa_root;
su_msg_r su_msg = SU_MSG_RINITIALIZER; su_msg_r su_msg = SU_MSG_R_INIT;
if (su_msg_create(su_msg, if (su_msg_create(su_msg,
su_root_task(root), su_root_task(root),
......
...@@ -1131,7 +1131,7 @@ int hc_reply(nth_client_t * hc, int status, char const *phrase) ...@@ -1131,7 +1131,7 @@ int hc_reply(nth_client_t * hc, int status, char const *phrase)
* executes the su_root_t event loop. * executes the su_root_t event loop.
*/ */
su_root_t *root = he->he_root; su_root_t *root = he->he_root;
su_msg_r su_msg = SU_MSG_RINITIALIZER; su_msg_r su_msg = SU_MSG_R_INIT;
if (su_msg_create(su_msg, if (su_msg_create(su_msg,
su_root_task(root), su_root_task(root),
......
...@@ -132,7 +132,7 @@ int su_root_size_hint = 64; ...@@ -132,7 +132,7 @@ int su_root_size_hint = 64;
* Tasks * Tasks
*/ */
su_task_r const su_task_null = SU_TASK_INIT; su_task_r const su_task_null = SU_TASK_R_INIT;
#define SU_TASK_ZAP(t, f) \ #define SU_TASK_ZAP(t, f) \
while (t->sut_port) { \ while (t->sut_port) { \
...@@ -358,7 +358,7 @@ int su_task_execute(su_task_r const task, ...@@ -358,7 +358,7 @@ int su_task_execute(su_task_r const task,
if (!su_port_own_thread(task->sut_port)) { if (!su_port_own_thread(task->sut_port)) {
#if SU_HAVE_PTHREADS #if SU_HAVE_PTHREADS
su_msg_r m = SU_MSG_RINITIALIZER; su_msg_r m = SU_MSG_R_INIT;
struct su_task_execute *frame; struct su_task_execute *frame;
if (su_msg_create(m, task, su_task_null, if (su_msg_create(m, task, su_task_null,
...@@ -857,7 +857,7 @@ _su_task_r su_root_parent(su_root_t const *self) ...@@ -857,7 +857,7 @@ _su_task_r su_root_parent(su_root_t const *self)
return su_task_null; return su_task_null;
} }
/** Add a pre-poll callback */ /** Add a pre-poll callback. */
int su_root_add_prepoll(su_root_t *root, int su_root_add_prepoll(su_root_t *root,
su_prepoll_f *callback, su_prepoll_f *callback,
su_prepoll_magic_t *magic) su_prepoll_magic_t *magic)
...@@ -1287,7 +1287,7 @@ int su_clone_pause(su_clone_r rclone) ...@@ -1287,7 +1287,7 @@ int su_clone_pause(su_clone_r rclone)
{ {
#if SU_HAVE_PTHREADS /* No-op without threads */ #if SU_HAVE_PTHREADS /* No-op without threads */
su_cloned_t *cloned = su_msg_data(rclone); su_cloned_t *cloned = su_msg_data(rclone);
su_msg_r m = SU_MSG_RINITIALIZER; su_msg_r m = SU_MSG_R_INIT;
if (!cloned) if (!cloned)
return (errno = EFAULT), -1; return (errno = EFAULT), -1;
......
...@@ -277,7 +277,7 @@ do_init(su_root_t *root, struct pinger *p) ...@@ -277,7 +277,7 @@ do_init(su_root_t *root, struct pinger *p)
/* Create a sockets, */ /* Create a sockets, */
p->s = s = udpsocket(); p->s = s = udpsocket();
if (su_create_wait(&w0, s, SU_WAIT_IN) == SOCKET_ERROR) { if (su_wait_create(&w0, s, SU_WAIT_IN) == SOCKET_ERROR) {
su_perror("su_create_wait"); su_perror("su_create_wait");
return SU_FAILURE; return SU_FAILURE;
} }
...@@ -288,7 +288,7 @@ do_init(su_root_t *root, struct pinger *p) ...@@ -288,7 +288,7 @@ do_init(su_root_t *root, struct pinger *p)
return SU_FAILURE; return SU_FAILURE;
} }
if (su_create_wait(&w, s, SU_WAIT_IN) == SOCKET_ERROR) { if (su_wait_create(&w, s, SU_WAIT_IN) == SOCKET_ERROR) {
su_perror("su_create_wait"); su_perror("su_create_wait");
return SU_FAILURE; return SU_FAILURE;
} }
...@@ -441,7 +441,7 @@ int main(int argc, char *argv[]) ...@@ -441,7 +441,7 @@ int main(int argc, char *argv[])
{ {
su_root_t *root; su_root_t *root;
su_clone_r ping = SU_CLONE_R_INIT, pong = SU_CLONE_R_INIT; su_clone_r ping = SU_CLONE_R_INIT, pong = SU_CLONE_R_INIT;
su_msg_r start_msg = SU_MSG_RINITIALIZER; su_msg_r start_msg = SU_MSG_R_INIT;
su_timer_t *t; su_timer_t *t;
int opt_alarm = 1; int opt_alarm = 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment