Merge lp:~rockstar/ubuntuone-ios-music/fix-warnings into lp:ubuntuone-ios-music

Proposed by Paul Hummer
Status: Merged
Approved by: Zachery Bir
Approved revision: 221
Merged at revision: 222
Proposed branch: lp:~rockstar/ubuntuone-ios-music/fix-warnings
Merge into: lp:ubuntuone-ios-music
Diff against target: 79 lines (+10/-16)
4 files modified
utilities/U1HTTPRequest.h (+0/-4)
utilities/U1HTTPRequest.m (+6/-3)
utilities/U1HTTPResponse.h (+0/-4)
utilities/U1HTTPResponse.m (+4/-5)
To merge this branch: bzr merge lp:~rockstar/ubuntuone-ios-music/fix-warnings
Reviewer Review Type Date Requested Status
Zachery Bir Approve
Review via email: mp+111910@code.launchpad.net

Commit message

Remove warnings.

Description of the change

Very superficial, meaningless branch. I killed all the build warnings. It's basically a "6 of one, half a dozen of the other" situation. I'm of the opinion that explicit is always better than implicit, but there might be some idiomatic Obj-C thing that I don't know about.

Feel free to reject this branch. I'm of the opinion that warnings should always be heeded, and we should keep the build clean if at all possible, but I'm the junior here. :)

To post a comment you must log in.
Revision history for this message
Zachery Bir (urbanape) wrote :

Yeah, allowing for the LLVM changes just opens another can of worms (and warnings in code we don't own (and don't want to)).

I'm +1 for this branch, though.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'utilities/U1HTTPRequest.h'
2--- utilities/U1HTTPRequest.h 2012-02-07 01:21:38 +0000
3+++ utilities/U1HTTPRequest.h 2012-06-25 18:30:36 +0000
4@@ -25,8 +25,6 @@
5 }
6
7 - (NSURL*)URL;
8-- (NSString*)HTTPMethod;
9-- (NSDictionary*)allHTTPHeaderFields;
10 - (NSString*)valueForHTTPHeaderField:(NSString*)field;
11
12 + (U1HTTPRequest*)requestFromCFHTTPMessage:(CFHTTPMessageRef)httpMessage;
13@@ -36,6 +34,4 @@
14
15 @interface U1MutableHTTPRequest : U1HTTPRequest
16
17-- (void)setValue:(NSString*)value forHTTPHeaderField:(NSString *)field;
18-
19 @end
20
21=== modified file 'utilities/U1HTTPRequest.m'
22--- utilities/U1HTTPRequest.m 2012-02-07 23:01:23 +0000
23+++ utilities/U1HTTPRequest.m 2012-06-25 18:30:36 +0000
24@@ -36,9 +36,12 @@
25 return self;
26 }
27
28-- (id)forwardingTargetForSelector:(SEL)aSelector;
29-{
30- return httpMessage;
31+-(NSURL *)URL {
32+ return [httpMessage URL];
33+}
34+
35+-(NSString *)valueForHTTPHeaderField:(NSString *)field {
36+ return [httpMessage valueForHTTPHeaderField:field];
37 }
38
39 @end
40
41=== modified file 'utilities/U1HTTPResponse.h'
42--- utilities/U1HTTPResponse.h 2012-02-07 23:01:23 +0000
43+++ utilities/U1HTTPResponse.h 2012-06-25 18:30:36 +0000
44@@ -26,10 +26,6 @@
45
46 @property (retain, readonly) U1StreamReader *HTTPBodyStream;
47
48-- (NSInteger)statusCode;
49-- (NSDictionary*)allHTTPHeaderFields;
50-- (NSString*)valueForHTTPHeaderField:(NSString*)field;
51-
52 @end
53
54
55
56=== modified file 'utilities/U1HTTPResponse.m'
57--- utilities/U1HTTPResponse.m 2012-02-07 23:01:23 +0000
58+++ utilities/U1HTTPResponse.m 2012-06-25 18:30:36 +0000
59@@ -27,11 +27,6 @@
60
61 @synthesize HTTPBodyStream;
62
63-- (id)forwardingTargetForSelector:(SEL)aSelector;
64-{
65- return httpMessage;
66-}
67-
68 - (void)dealloc;
69 {
70 [HTTPBodyStream release];
71@@ -57,4 +52,8 @@
72 return self;
73 }
74
75+- (void)setValue:(NSString *)value forHTTPHeaderField:(NSString *)field {
76+ [httpMessage setValue:value forKey:field];
77+}
78+
79 @end

Subscribers

People subscribed via source and target branches