From c0137b33c535eb04f5e7d5628e9a225e226c5b34 Mon Sep 17 00:00:00 2001
From: Alex Merry <dev@randomguy3.me.uk>
Date: Mon, 25 Mar 2013 15:28:37 +0000
Subject: Fix clang warnings

---
 tikzit/src/common/Edge.m               |  9 ++++++---
 tikzit/src/common/TikzGraphAssembler.m | 13 ++++---------
 tikzit/src/common/tikzlexer.lm         |  4 +---
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/tikzit/src/common/Edge.m b/tikzit/src/common/Edge.m
index cabf860..9b607e6 100644
--- a/tikzit/src/common/Edge.m
+++ b/tikzit/src/common/Edge.m
@@ -402,23 +402,26 @@
     [self didChangeValueForKey:@"hasEdgeNode"];
 }
 
-@synthesize sourceAnchor;
-@synthesize targetAnchor;
-
+- (NSString*) sourceAnchor { return sourceAnchor; }
 - (void)setSourceAnchor:(NSString *)_sourceAnchor{
+	NSString *oldSourceAnchor = sourceAnchor;
     if(_sourceAnchor != nil){
         sourceAnchor = [_sourceAnchor copy];
     }else{
         sourceAnchor = @"";
     }
+	[oldSourceAnchor release];
 }
 
+- (NSString*) targetAnchor { return targetAnchor; }
 - (void)setTargetAnchor:(NSString *)_targetAnchor{
+	NSString *oldTargetAnchor = targetAnchor;
     if(_targetAnchor != nil){
         targetAnchor = [_targetAnchor copy];
     }else{
         targetAnchor = @"";
     }
+	[oldTargetAnchor release];
 }
 
 @synthesize data;
diff --git a/tikzit/src/common/TikzGraphAssembler.m b/tikzit/src/common/TikzGraphAssembler.m
index b2c372a..0c24b7c 100644
--- a/tikzit/src/common/TikzGraphAssembler.m
+++ b/tikzit/src/common/TikzGraphAssembler.m
@@ -169,15 +169,12 @@
 	
 	if (token_offset + token_len > context_len) {
 		// error position state is corrupted
-		NSLog(@"Got bad error state for error \"%s\": start(%i,%i), end(%i,%i)\n    context_len = %d; token_offset = %d; token_len = %d",
+		NSLog(@"Got bad error state for error \"%s\": start(%i,%i), end(%i,%i)",
 				message,
 				yylloc->first_line,
 				yylloc->first_column,
 				yylloc->last_line,
-				yylloc->last_column,
-				context_len,
-				token_offset,
-				token_len);
+				yylloc->last_column);
 		[self setLastError:[NSError errorWithMessage:nsmsg
 												code:TZ_ERR_PARSE]];
 	} else {
@@ -216,10 +213,8 @@
 			if (nlp) {
 				*nlp = '\0';
 				context_len = nlp - context;
-				if (token_offset >= context_len) {
-					NSLog(@"token_offset (%d) >= context_len (%d) -- what?", token_offset, context_len);
-					return;
-				} else if (token_offset + token_len > context_len) {
+				NSAssert2(token_offset < context_len, @"token_offset (%lu) < context_len (%lu)", token_offset, context_len);
+				if (token_offset + token_len > context_len) {
 					token_len = context_len - token_offset;
 				}
 			} else {
diff --git a/tikzit/src/common/tikzlexer.lm b/tikzit/src/common/tikzlexer.lm
index 2956a8b..a0e5968 100644
--- a/tikzit/src/common/tikzlexer.lm
+++ b/tikzit/src/common/tikzlexer.lm
@@ -153,9 +153,7 @@ to                             {  return TO; }
 		[buf appendFormat:@"%c", c];
 	}
 	
-	NSString *s = [buf copy];
-	[s autorelease];
-	yylval->nsstr = s;
+	yylval->nsstr = buf;
 	return DELIMITEDSTRING;
 }
 
-- 
cgit v1.2.3