changeset 412:66991b1776df

Remove call to myunlock, since it's closed right after
author mmj
date Fri, 14 Jan 2005 06:37:11 +1100
parents 79355dd5ecc2
children 1705c8e709b4
files src/mlmmj-sub.c src/mlmmj-unsub.c
diffstat 2 files changed, 1 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/mlmmj-sub.c	Fri Jan 14 06:35:22 2005 +1100
+++ b/src/mlmmj-sub.c	Fri Jan 14 06:37:11 2005 +1100
@@ -391,9 +391,8 @@
 			address[len] = 0;
 		}
 	} else {
-		myunlock(subfilefd);
+		close(subfilefd);
 		myfree(subfilename);
-		close(subfilefd);
 		
 		return EXIT_SUCCESS;
 	}
--- a/src/mlmmj-unsub.c	Fri Jan 14 06:35:22 2005 +1100
+++ b/src/mlmmj-unsub.c	Fri Jan 14 06:37:11 2005 +1100
@@ -455,7 +455,6 @@
 		if(subwrite == -1){
 			log_error(LOG_ARGS, "Could not open '%s'",
 					subwritename);
-			myunlock(subread);
 			close(subread);
 			myfree(subreadname);
 			myfree(subwritename);
@@ -466,7 +465,6 @@
 		if(wlock < 0) {
 			log_error(LOG_ARGS, "Error locking '%s'",
 					subwritename);
-			myunlock(subread);
 			close(subread);
 			close(subwrite);
 			myfree(subreadname);
@@ -476,8 +474,6 @@
 
 		unsubres = unsubscribe(subread, subwrite, address);
 		if(unsubres < 0) {
-			myunlock(subread);
-			myunlock(subwrite);
 			close(subread);
 			close(subwrite);
 			unlink(subwritename);
@@ -493,8 +489,6 @@
 				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 @@
 		} else /* unsubres == 0, no subscribers left */
 			unlink(subwritename);
 
-		myunlock(subread);
-		myunlock(subwrite);
 		close(subread);
 		close(subwrite);
 		myfree(subreadname);