From: mmj <none@none>
Date: Thu, 13 Jan 2005 19:37:11 +0000 (+1100)
Subject: Remove call to myunlock, since it's closed right after
X-Git-Tag: RELEASE_1_2_0~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4f0d88e69a22f28bed5ef3a3d58ddf19e5d263c;p=thirdparty%2Fmlmmj.git

Remove call to myunlock, since it's closed right after
---

diff --git a/src/mlmmj-sub.c b/src/mlmmj-sub.c
index 73372b82..ec06a0e6 100644
--- a/src/mlmmj-sub.c
+++ b/src/mlmmj-sub.c
@@ -391,9 +391,8 @@ int main(int argc, char **argv)
 			address[len] = 0;
 		}
 	} else {
-		myunlock(subfilefd);
-		myfree(subfilename);
 		close(subfilefd);
+		myfree(subfilename);
 		
 		return EXIT_SUCCESS;
 	}
diff --git a/src/mlmmj-unsub.c b/src/mlmmj-unsub.c
index a9f8e98a..780c0ce6 100644
--- a/src/mlmmj-unsub.c
+++ b/src/mlmmj-unsub.c
@@ -455,7 +455,6 @@ int main(int argc, char **argv)
 		if(subwrite == -1){
 			log_error(LOG_ARGS, "Could not open '%s'",
 					subwritename);
-			myunlock(subread);
 			close(subread);
 			myfree(subreadname);
 			myfree(subwritename);
@@ -466,7 +465,6 @@ int main(int argc, char **argv)
 		if(wlock < 0) {
 			log_error(LOG_ARGS, "Error locking '%s'",
 					subwritename);
-			myunlock(subread);
 			close(subread);
 			close(subwrite);
 			myfree(subreadname);
@@ -476,8 +474,6 @@ int main(int argc, char **argv)
 
 		unsubres = unsubscribe(subread, subwrite, address);
 		if(unsubres < 0) {
-			myunlock(subread);
-			myunlock(subwrite);
 			close(subread);
 			close(subwrite);
 			unlink(subwritename);
@@ -493,8 +489,6 @@ int main(int argc, char **argv)
 				log_error(LOG_ARGS,
 					"Could not rename '%s' to '%s'",
 					subwritename, subreadname);
-				myunlock(subread);
-				myunlock(subwrite);
 				close(subread);
 				close(subwrite);
 				myfree(subreadname);
@@ -504,8 +498,6 @@ int main(int argc, char **argv)
 		} else /* unsubres == 0, no subscribers left */
 			unlink(subwritename);
 
-		myunlock(subread);
-		myunlock(subwrite);
 		close(subread);
 		close(subwrite);
 		myfree(subreadname);