INN commit: trunk (6 files)

INN Commit Russ_Allbery at isc.org
Sun Jun 22 20:34:26 UTC 2008


    Date: Sunday, June 22, 2008 @ 13:34:26
  Author: iulius
Revision: 7901

Typo (canceled -> cancelled).

Modified:
  trunk/doc/man/inndcomm.3
  trunk/doc/man/libstorage.3
  trunk/doc/pod/hook-python.pod
  trunk/include/inn/storage.h
  trunk/innd/art.c
  trunk/storage/timecaf/timecaf.c

---------------------------+
 doc/man/inndcomm.3        |    2 +-
 doc/man/libstorage.3      |    2 +-
 doc/pod/hook-python.pod   |    8 ++++----
 include/inn/storage.h     |    2 +-
 innd/art.c                |    2 +-
 storage/timecaf/timecaf.c |    2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

Modified: doc/man/inndcomm.3
===================================================================
--- doc/man/inndcomm.3	2008-06-22 20:33:41 UTC (rev 7900)
+++ doc/man/inndcomm.3	2008-06-22 20:34:26 UTC (rev 7901)
@@ -104,7 +104,7 @@
 .I ICCcancel
 sends a ``cancel'' message to the server.
 .I Mesgid
-is the Message-ID of the article that should be canceled.
+is the Message-ID of the article that should be cancelled.
 The return value is the same as for
 .IR ICCcommand .
 .PP

Modified: doc/man/libstorage.3
===================================================================
--- doc/man/libstorage.3	2008-06-22 20:33:41 UTC (rev 7900)
+++ doc/man/libstorage.3	2008-06-22 20:34:26 UTC (rev 7901)
@@ -277,7 +277,7 @@
 .in +0.5i
 .nf
 SM_HEAD	flushes cached header
-SM_CANCELEDART	flushes articles which should be canceled
+SM_CANCELLEDART	flushes articles which should be cancelled
 SM_ALL	flushes all cached data
 .fi
 .in -0.5i

Modified: doc/pod/hook-python.pod
===================================================================
--- doc/pod/hook-python.pod	2008-06-22 20:33:41 UTC (rev 7900)
+++ doc/pod/hook-python.pod	2008-06-22 20:34:26 UTC (rev 7901)
@@ -258,9 +258,9 @@
     # local server; it doesn't send out a control message or anything
     # scary like that.  Returns 1 if successful, else 0.
     if INN.cancel('<meow$123.456 at solvangpastries.edu>'):
-        canceled = "yup"
+        cancelled = "yup"
     else:
-        canceled = "nope"
+        cancelled = "nope"
 
     # Check if a given message is in history.  This doesn't
     # necessarily mean the article is on your spool; cancelled and
@@ -275,8 +275,8 @@
     # Here we are running a local spam filter, so why eat all those
     # cancels?  We can add fake entries to history so they'll get
     # refused.  Returns 1 on success, 0 on failure.
-    canceled_id = buffer('<meow$123.456 at isc.org>')
-    if INN.addhist("<cancel." + canceled_id[1:]):
+    cancelled_id = buffer('<meow$123.456 at isc.org>')
+    if INN.addhist("<cancel." + cancelled_id[1:]):
         thought = "Eat my dust, roadkill!"
     else:
         thought = "Darn, someone beat me to it."

Modified: include/inn/storage.h
===================================================================
--- include/inn/storage.h	2008-06-22 20:33:41 UTC (rev 7900)
+++ include/inn/storage.h	2008-06-22 20:34:26 UTC (rev 7901)
@@ -60,7 +60,7 @@
 extern char             *SMerrorstr;
 
 typedef enum {SELFEXPIRE, SMARTNGNUM, EXPENSIVESTAT} PROBETYPE;
-typedef enum {SM_ALL, SM_HEAD, SM_CANCELEDART} FLUSHTYPE;
+typedef enum {SM_ALL, SM_HEAD, SM_CANCELLEDART} FLUSHTYPE;
 
 struct artngnum {
     char	*groupname;

Modified: innd/art.c
===================================================================
--- innd/art.c	2008-06-22 20:33:41 UTC (rev 7900)
+++ innd/art.c	2008-06-22 20:34:26 UTC (rev 7901)
@@ -1250,7 +1250,7 @@
   if (!SMcancel(token) && SMerrno != SMERR_NOENT && SMerrno != SMERR_UNINIT)
     syslog(L_ERROR, "%s cant cancel %s (SMerrno %d)", LogName,
 	TokenToText(token), SMerrno);
-  if (innconf->immediatecancel && !SMflushcacheddata(SM_CANCELEDART))
+  if (innconf->immediatecancel && !SMflushcacheddata(SM_CANCELLEDART))
     syslog(L_ERROR, "%s cant cancel cached %s", LogName, TokenToText(token));
   snprintf(buff, sizeof(buff), "Cancelling %s",
            MaxLength(MessageID, MessageID));

Modified: storage/timecaf/timecaf.c
===================================================================
--- storage/timecaf/timecaf.c	2008-06-22 20:33:41 UTC (rev 7900)
+++ storage/timecaf/timecaf.c	2008-06-22 20:34:26 UTC (rev 7901)
@@ -842,7 +842,7 @@
 }
 
 bool timecaf_flushcacheddata(FLUSHTYPE type) {
-    if (type == SM_ALL || type == SM_CANCELEDART)
+    if (type == SM_ALL || type == SM_CANCELLEDART)
 	DoCancels();
     return true;
 }



More information about the inn-committers mailing list