Changeset 1230 for 1.8.3/trunk

Timestamp:

04/03/08 20:32:36 (3 months ago)

Author:

shawnw

Message:

Fix @chan/what to show actual line count

Files:

• 1.8.3/trunk/CHANGES.183 (modified) (1 diff)
• 1.8.3/trunk/hdrs/bufferq.h (modified) (1 diff)
• 1.8.3/trunk/src/bufferq.c (modified) (3 diffs)
• 1.8.3/trunk/src/extchat.c (modified) (2 diffs)

1.8.3/trunk/CHANGES.183

@@ -19 +19 @@
-Fixes:
- * Compilation fixes on various platforms. [SW]
+ * @chan/what reports the number of actual lines stored in 
+   recall buffers, not the number of blocks. Reported by
+   qa'toq [SW]
-
-Version 1.8.3 patchlevel 6                      Jan 01, 2008

1.8.3/trunk/hdrs/bufferq.h

@@ -25 +25 @@
-#define BufferQLastType(b) ((b)->last_type)
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+

1.8.3/trunk/src/bufferq.c

@@ -225 +225 @@
-}
-
-line
-
-line
+block
+
+8k block
- */
-int
-line
+block
-{
-  if (bq && bq->buffer)
@@ -238 +238 @@
-}
-
+/** Number of lines stored in queue.
+ * \param bq pointer to buffer queue.
+ * \return line count
+ */
+int
+bufferq_lines(BUFFERQ *bp)
+{
+  int lines = 0;
+  char *p = NULL;
+  dbref player;
+  int type;
+  time_t t;
+
+
+  if (isempty_bufferq(bp))
+    return 0;
+
+  while (iter_bufferq(bp, &p, &player, &type, &t))
+    lines++;
+
+  return lines;
+}
+
-/** Is a buffer queue empty?
- * \param bq pointer to buffer queue.
@@ -243 +266 @@
- * \retval 0 the buffer queue is not empty (has messages).
- */
-
+
-isempty_bufferq(BUFFERQ *bq)
-{

1.8.3/trunk/src/extchat.c

@@ -2131 +2131 @@
-                    (u && Chanuser_Quiet(u)) ? 'Q' : ' ',
-                    (u && Chanuser_Hide(u)) ? 'H' : ' ',
-line
+block
-    }
-  }
@@ -2686 +2686 @@
-      if (ChanBufferQ(c))
-        notify_format(player, "@channel/buffer %s = %d", ChanName(c),
-line
+block
-      if (!brief) {
-        for (u = ChanUsers(c); u; u = u->next) {