From ce2bcaf875d8edbd3bc72b1562990dfe2688f2d1 Mon Sep 17 00:00:00 2001
From: Per Cederqvist <ceder@lysator.liu.se>
Date: Sun, 30 Dec 2001 22:32:54 +0000
Subject: [PATCH] (aux_item_default_definition): Removed left-over traces of
"extended aux-items", a concept that didn't scale and was abandoned a
long time ago. (Bug 346).
---
src/server/aux-items.c | 47 +-----------------------------------------
1 file changed, 1 insertion(+), 46 deletions(-)
diff --git a/src/server/aux-items.c b/src/server/aux-items.c
index ce5304aef..f46a77c22 100644
--- a/src/server/aux-items.c
+++ b/src/server/aux-items.c
@@ -1,5 +1,5 @@
/*
- * $Id: aux-items.c,v 1.38 2001/12/30 22:22:05 ceder Exp $
+ * $Id: aux-items.c,v 1.39 2001/12/30 22:32:54 ceder Exp $
* Copyright (C) 1994-2001 Lysator Academic Computer Association.
*
* This file is part of the LysKOM server.
@@ -211,51 +211,6 @@ aux_item_default_definition(const Aux_item *item)
if (AUX_IS_PREDEFINED(item->tag))
return NULL;
-
- /* FIXME (bug 346): "extended item" is a concept that isn't
- implemented, and it conflicts with what the Protocol-A.texi
- documentation says. This code is probably a rest from the
- design phase, and it should probably be removed. */
-
- /* This might be an extended item. This code is very horrendous,
- execially if you take a closer look at the AUX_CHECK_BIT macro.
- I wrote it this way because I think it will work in a
- wrong-endian environment, and I was unsure of how well simple
- masking would. */
- /* MMMM XFUP SSSS CCCC NNNN NNNN NNNN NNNN */
-
-/*
- tmp = item->tag;
-
- extended = (tmp & 0x07000000) ? 1 : 0;
- def_s.author_only = (tmp & 0x04000000) ? 1 : 0;
- def_s.one_per_person = (tmp & 0x02000000) ? 1 : 0;
- def_s.may_not_delete = (tmp & 0x01000000) ? 1 : 0;
- def_s.set_flags.deleted = (tmp & 0x00700000) ? 1 : 0;
- def_s.set_flags.inherit = (tmp & 0x00400000) ? 1 : 0;
- def_s.set_flags.secret = (tmp & 0x00200000) ? 1 : 0;
- def_s.set_flags.hide_creator = (tmp & 0x00100000) ? 1 : 0;
- def_s.clear_flags.deleted = (tmp & 0x00070000) ? 1 : 0;
- def_s.clear_flags.inherit = (tmp & 0x00040000) ? 1 : 0;
- def_s.clear_flags.secret = (tmp & 0x00020000) ? 1 : 0;
- def_s.clear_flags.hide_creator = (tmp & 0x00010000) ? 1 : 0;
-
- def_s.tag = item->tag;
- def_s.inherit_limit = 0;
- def_s.name = "extended-default";
-
-
- / * If it wasn't extended, then it was simple, because it sure
- wasn't predefined. * /
-
- if (!extended)
- {
- return &simple_aux_item;
- }
-
- return &def_s;
-*/
-
return &simple_aux_item;
}
--
GitLab