diff --git a/src/server/ChangeLog b/src/server/ChangeLog
index 73b88232782005031776bd59c6f3ac692434e5b3..6fccbbd1a15c0dccbfd689440ab1a4030bb334a6 100644
--- a/src/server/ChangeLog
+++ b/src/server/ChangeLog
@@ -1,5 +1,12 @@
Thu Sep 5 10:14:40 1991 Per Cederqvist (ceder at lysator)
+ * cache.h, simple-cache.c, dbck-cache.c (cached_set_conf_type):
+ borttagen.
+
+ * conference.c, person.c: alla anrop till cached_set_conf_type
+ borttagna. (Funktionen anropades bara precis efter
+ mark_conference_as_changed.
+
* simple-cache.c: Fixade lite stavfel. La till lite nya defensiva
kontroller.
diff --git a/src/server/cache.h b/src/server/cache.h
index e6d8ff666d2c5ba954cbaec98d17d887d49d0441..3dbca8af14cee493df8a9262b349eb6bd7e79ac7 100644
--- a/src/server/cache.h
+++ b/src/server/cache.h
@@ -1,5 +1,5 @@
/*
- * $Id: cache.h,v 0.5 1991/08/28 02:21:58 ceder Exp $
+ * $Id: cache.h,v 0.6 1991/09/05 08:32:51 ceder Exp $
*
* This file contains the cached data that the server stores.
* .h file created by ceder 1990-04-18
@@ -86,8 +86,8 @@ cached_conf_exists( Conf_no conf_no );
/*
* Calls for the cacheing of conf_type:
- * cached_get_conf_type() returns the type, and
- * cached_set_conf_type() sets the type.
+ * cached_get_conf_type() returns the type.
+ * The type is set when mark_conference_as_changed is called.
*/
/* Get conference type */
@@ -97,24 +97,12 @@ extern Conf_type
cached_get_conf_type (Conf_no conf_no);
/*
- * Set the type. This call is used whenever a conference is created or the
- * conf_type is changed.
- */
-
-extern void
-cached_set_conf_type (Conf_no conf_no,
- Conf_type type);
-
-/*
- * Get/set garb_nice for a certain conference.
+ * Get garb_nice for a certain conference.
+ * It is set when mark_conference_as_changed is called.
*/
extern Garb_nice
cached_get_garb_nice (Conf_no conf_no);
-extern void
-cached_set_garb_nice (Conf_no conf_no,
- Garb_nice nice);
-
extern Local_text_no
cached_get_highest_local_no (Conf_no conf_no);
diff --git a/src/server/conference.c b/src/server/conference.c
index c9adb030ab3ddf66f00aa14a56f4222fd408db34..2a5a25016a3a6d2c6f02f97de6bfc796bfc5b896 100644
--- a/src/server/conference.c
+++ b/src/server/conference.c
@@ -4,7 +4,7 @@
* All atomic calls that deals with conferences.
*/
-static char *rcsid = "$Id: conference.c,v 0.9 1991/08/28 02:21:54 ceder Exp $";
+static char *rcsid = "$Id: conference.c,v 0.10 1991/09/05 08:32:50 ceder Exp $";
#include <time.h>
@@ -236,10 +236,8 @@ do_create_conf(String name,
conf_c->members = EMPTY_MEMBER_LIST;
conf_c->texts = EMPTY_TEXT_LIST;
- mark_conference_as_changed( conf_no );
+ mark_conference_as_changed (conf_no);
- cached_set_conf_type( conf_no, type );
-
return conf_no;
}
@@ -765,9 +763,7 @@ set_conf_type (Conf_no conf_no,
}
conf_c->type = type;
- mark_conference_as_changed( conf_no );
-
- cached_set_conf_type( conf_no, type );
+ mark_conference_as_changed (conf_no);
return OK;
}
diff --git a/src/server/dbck-cache.c b/src/server/dbck-cache.c
index 0eb3a9923e314bd1883fef8b945535a3b126fb74..d3d5ba8e3bd89f4f7447bdd68efe2ed933142177 100644
--- a/src/server/dbck-cache.c
+++ b/src/server/dbck-cache.c
@@ -8,7 +8,7 @@
* Also save time as a time_t instead of a struct tm.
*/
-static char *rcsid = "$Id: dbck-cache.c,v 0.5 1991/08/30 03:35:57 ceder Exp $";
+static char *rcsid = "$Id: dbck-cache.c,v 0.6 1991/09/05 08:32:48 ceder Exp $";
/*
@@ -92,14 +92,6 @@ BUGDECL;
}
-extern void
-cached_set_conf_type (Conf_no conf_no,
- Conf_type type)
-{
- return; /* No need to do anything in this simulation. */
-}
-
-
extern Conf_type
cached_get_conf_type (Conf_no conf_no)
{
diff --git a/src/server/person.c b/src/server/person.c
index 4ede4b8a51f87b8beab5b1db4b9d67cd76af641f..462c87d1ffa04bb1463612c24f84f4b012818363 100644
--- a/src/server/person.c
+++ b/src/server/person.c
@@ -4,7 +4,7 @@
* All atomic calls that deals with persons.
*/
-static char *rcsid = "$Id: person.c,v 0.6 1991/08/28 02:21:09 ceder Exp $";
+static char *rcsid = "$Id: person.c,v 0.7 1991/09/05 08:32:46 ceder Exp $";
#include <time.h>
#include <string.h>
@@ -419,9 +419,7 @@ create_person (String name,
mailbox->members = EMPTY_MEMBER_LIST;
mailbox->texts = EMPTY_TEXT_LIST;
- mark_conference_as_changed( new_user );
-
- cached_set_conf_type(new_user, mailbox->type);
+ mark_conference_as_changed (new_user);
/* allocate Person */
diff --git a/src/server/simple-cache.c b/src/server/simple-cache.c
index 6da340180ab5ff37c16761b3c987e75abae9afe4..e3fe98bf27072798396e6b8cb24c523be1743eb4 100644
--- a/src/server/simple-cache.c
+++ b/src/server/simple-cache.c
@@ -9,7 +9,7 @@
* New save algorithm by ceder.
*/
-static char *rcsid = "$Id: simple-cache.c,v 0.14 1991/09/05 08:25:58 ceder Exp $";
+static char *rcsid = "$Id: simple-cache.c,v 0.15 1991/09/05 08:32:44 ceder Exp $";
@@ -249,18 +249,6 @@ cached_change_name( Conf_no name_num,
}
-extern void
-cached_set_conf_type (Conf_no conf_no,
- Conf_type type)
-{
- if ( conf_no < 1 || conf_no >= next_free_num )
- restart_kom("cached_set_conf_type(%d, ----): next_free_num==%d",
- conf_no, next_free_num);
-
- small_conf_arr[ conf_no ]->type = type;
-}
-
-
extern Conf_type
cached_get_conf_type (Conf_no conf_no)
{