INEWS_changeApprovalStatus() and INEWS_changeDeletionStatus() now suc…

…ceed without going to the network if their respective flags are already set. Renamed a parameter to fix problems with C++ compilers.
icculus · Oct 18, 2002 · 79b6253 · 79b6253
1 parent 585316f
commit 79b6253
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/libinews/IcculusNews.h b/libinews/IcculusNews.h
@@ -149,7 +149,7 @@ extern Sint8 INEWS_submitArticle(char *title, char *body);
 Sint8 INEWS_changeApprovalStatus(Uint32 aid, bool approve);
 
 /* change the deletion status of article aid */
-Sint8 INEWS_changeDeletionStatus(Uint32 aid, bool delete);
+Sint8 INEWS_changeDeletionStatus(Uint32 aid, bool deleteflag);
 
 /* free the memory dynamically allocated by a call to INEWS_digest */
 extern void INEWS_freeDigest(ArticleInfo **digest);

diff --git a/libinews/internals.h b/libinews/internals.h
@@ -95,7 +95,7 @@ Sint8 INEWS_changeQueue(int qid);
 ArticleInfo **INEWS_digest(int offset, int n);
 Sint8 INEWS_submitArticle(char *title, char *body);
 Sint8 INEWS_changeApprovalStatus(Uint32 aid, bool approve);
-Sint8 INEWS_changeDeletionStatus(Uint32 aid, bool delete);
+Sint8 INEWS_changeDeletionStatus(Uint32 aid, bool deleteflag);
 void INEWS_disconnect();
 
 Sint8 __read_line(char *str, int max_sz);

diff --git a/libinews/net.c b/libinews/net.c
@@ -357,7 +357,7 @@ ArticleInfo **INEWS_digest(int offset, int n) {
     if (offset > 0)
         sprintf(off_str, "%i", offset);
     else
-        sprintf(off_str, "-", offset);
+        sprintf(off_str, "-");
 
     sprintf(tempstring, "DIGEST %s %i\n", off_str, n);
 
@@ -533,6 +533,7 @@ Sint8 INEWS_submitArticle(char *title, char *body) {
 
 Sint8 INEWS_changeApprovalStatus(Uint32 aid, bool approve) {
     char tempstring[256];
+    ArticleInfo **artinfo;
 
     if (!serverstate.connected) {
 	__inews_errno = ERR_DISCONNECTED;
@@ -544,6 +545,17 @@ Sint8 INEWS_changeApprovalStatus(Uint32 aid, bool approve) {
 	goto end_failure;
     }
 
+    artinfo = INEWS_digest(aid + 1, 1);
+    if (artinfo[0]->approved == approve) {
+        INEWS_freeDigest(artinfo);
+        goto end_success;
+    } else if (artinfo[0]->deleted) {
+        INEWS_freeDigest(artinfo);
+        __inews_errno = ERR_GENERIC;
+        goto end_failure;
+    } else INEWS_freeDigest(artinfo);
+
+
     memset(tempstring, 0, 256);
 
     if (approve) {
@@ -593,8 +605,9 @@ Sint8 INEWS_changeApprovalStatus(Uint32 aid, bool approve) {
     FUNC_END(0, -1);
 }
 
-Sint8 INEWS_changeDeletionStatus(Uint32 aid, bool delete) {
+Sint8 INEWS_changeDeletionStatus(Uint32 aid, bool deleteflag) {
     char tempstring[256];
+    ArticleInfo **artinfo;
 
     if (!serverstate.connected) {
 	__inews_errno = ERR_DISCONNECTED;
@@ -606,9 +619,15 @@ Sint8 INEWS_changeDeletionStatus(Uint32 aid, bool delete) {
 	goto end_failure;
     }
 
+    artinfo = INEWS_digest(aid + 1, 1);
+    if (artinfo[0]->deleted == deleteflag) {
+        INEWS_freeDigest(artinfo);
+        goto end_success;
+    } else INEWS_freeDigest(artinfo);
+
     memset(tempstring, 0, 256);
 
-    if (delete) {
+    if (deleteflag) {
 	sprintf(tempstring, "DELETE %i\n", aid);
     } else {
 	sprintf(tempstring, "UNDELETE %i\n", aid);