Commit 80e2e135 authored by Per Cederqvist's avatar Per Cederqvist
Browse files

Use ``union result_holder'' instead of ``Result_holder''. (Bug 337).

parent f0b7a912
2001-12-28 Per Cederqvist <ceder@moria> 2001-12-28 Per Cederqvist <ceder@moria>
Use ``union result_holder'' instead of ``Result_holder''. (Bug 337).
* src/server/connections.h (union result_holder): Result_holder
typedef removed.
* src/server/connections.c: Use ``union result_holder'' instead of
``Result_holder''.
* src/server/prot-a.h: Ditto.
* src/server/prot-a.c: Ditto.
* doc/lyskomd.texi (Adding New Result Types): Use ``union
result_holder'' instead of ``Result_holder''.
(Modifying Output Types): Ditto.
Use ``union info_datum instead of ``Info_datum''. (Bug 337). Use ``union info_datum instead of ``Info_datum''. (Bug 337).
* src/server/manipulate.h (ADD_MISC): Use ``union info_datum * src/server/manipulate.h (ADD_MISC): Use ``union info_datum
instead of ``Info_datum''. instead of ``Info_datum''.
......
/* /*
* $Id: connections.c,v 0.71 2001/11/04 21:03:53 ceder Exp $ * $Id: connections.c,v 0.72 2001/12/28 20:46:30 ceder Exp $
* Copyright (C) 1991-2000 Lysator Academic Computer Association. * Copyright (C) 1991-2000 Lysator Academic Computer Association.
* *
* This file is part of the LysKOM server. * This file is part of the LysKOM server.
...@@ -226,8 +226,8 @@ logout_all_clients(void) ...@@ -226,8 +226,8 @@ logout_all_clients(void)
* The pointer points to static data which is overwritten on each call. * The pointer points to static data which is overwritten on each call.
*/ */
static Success static Success
call_function (Connection * client, call_function(Connection *client,
Result_holder * res) /* This is a union. */ union result_holder *res)
{ {
Success status=FAILURE; /* OK if the call was successful. */ Success status=FAILURE; /* OK if the call was successful. */
...@@ -332,8 +332,8 @@ free_parsed(Connection *client) ...@@ -332,8 +332,8 @@ free_parsed(Connection *client)
*/ */
static void static void
reply(Connection *client, reply(Connection *client,
Success status, Success status,
Result_holder *result) union result_holder *result)
{ {
switch(client->protocol) switch(client->protocol)
{ {
...@@ -357,7 +357,7 @@ parse_unparsed(Connection *client) ...@@ -357,7 +357,7 @@ parse_unparsed(Connection *client)
{ {
String tmp_str = EMPTY_STRING; String tmp_str = EMPTY_STRING;
Success status; Success status;
Result_holder result; union result_holder result;
switch ( setjmp(parse_env) ) switch ( setjmp(parse_env) )
{ {
......
/* /*
* $Id: prot-a.c,v 0.65 2001/12/28 20:05:07 ceder Exp $ * $Id: prot-a.c,v 0.66 2001/12/28 20:46:30 ceder Exp $
* Copyright (C) 1991-2000 Lysator Academic Computer Association. * Copyright (C) 1991-2000 Lysator Academic Computer Association.
* *
* This file is part of the LysKOM server. * This file is part of the LysKOM server.
...@@ -64,7 +64,7 @@ BUGDECL; ...@@ -64,7 +64,7 @@ BUGDECL;
void void
prot_a_reply(Connection *client, prot_a_reply(Connection *client,
Success status, Success status,
Result_holder *res) union result_holder *res)
{ {
/* /*
* The function is called. Now return the answer. * The function is called. Now return the answer.
...@@ -160,7 +160,7 @@ prot_a_reply(Connection *client, ...@@ -160,7 +160,7 @@ prot_a_reply(Connection *client,
&res->session_info); &res->session_info);
/* Clear username, since it is allocated (in get_session_info() /* Clear username, since it is allocated (in get_session_info()
in session.c). See comment abover the definition of in session.c). See comment abover the definition of
typedef Result_holder in connections.h. */ union result_holder in connections.h. */
s_clear(&res->session_info.username); s_clear(&res->session_info.username);
BUG(("={Session_info not listed}\n")); BUG(("={Session_info not listed}\n"));
break; break;
......
/* /*
* $Id: prot-a.h,v 0.8 1999/05/24 09:38:28 ceder Exp $ * $Id: prot-a.h,v 0.9 2001/12/28 20:46:30 ceder Exp $
* Copyright (C) 1991, 1994-1995, 1999 Lysator Academic Computer Association. * Copyright (C) 1991, 1994-1995, 1999 Lysator Academic Computer Association.
* *
* This file is part of the LysKOM server. * This file is part of the LysKOM server.
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
* Please mail bug reports to bug-lyskom@lysator.liu.se. * Please mail bug reports to bug-lyskom@lysator.liu.se.
*/ */
/* /*
* $Id: prot-a.h,v 0.8 1999/05/24 09:38:28 ceder Exp $ * $Id: prot-a.h,v 0.9 2001/12/28 20:46:30 ceder Exp $
* *
*/ */
void void
...@@ -35,7 +35,7 @@ prot_a_destruct(Connection *conn); ...@@ -35,7 +35,7 @@ prot_a_destruct(Connection *conn);
void void
prot_a_reply(Connection *client, prot_a_reply(Connection *client,
Success status, Success status,
Result_holder *result); union result_holder *result);
void void
prot_a_parse_packet(Connection *client); prot_a_parse_packet(Connection *client);
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