Navigation

← Previous Changeset
Next Changeset →

Changeset 1048

Timestamp:

03/24/04 22:38:21 (5 years ago)

Author:

morris

Message:

change off_ts to unsigned long longs

Files:

WiredClient/trunk/NSNumberAdditions.m (modified) (2 diffs)
WiredClient/trunk/WCCache.h (modified) (2 diffs)
WiredClient/trunk/WCCache.m (modified) (3 diffs)
WiredClient/trunk/WCFile.h (modified) (3 diffs)
WiredClient/trunk/WCFile.m (modified) (7 diffs)
WiredClient/trunk/WCFileInfo.m (modified) (2 diffs)
WiredClient/trunk/WCFiles.m (modified) (5 diffs)
WiredClient/trunk/WCSearch.m (modified) (3 diffs)
WiredClient/trunk/WCServerInfo.m (modified) (2 diffs)
WiredClient/trunk/WCTransfer.h (modified) (3 diffs)
WiredClient/trunk/WCTransfer.m (modified) (9 diffs)
WiredClient/trunk/WCTransfers.m (modified) (7 diffs)
WiredClient/trunk/WCUserInfo.m (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

WiredClient/trunk/NSNumberAdditions.m

r1016	r1048
1		/* $Id: NSNumberAdditions.m,v 1.~~4 2004/03/17 16:07:07~~ morris Exp $ */
	1	/* $Id: NSNumberAdditions.m,v 1.5 2004/03/24 21:38:21 morris Exp $ */
2	2
3	3	/*
…	…
35	35	NSNumberFormatter *formatter;
36	36	NSArray *prefixes;
37		~~off_t~~ bytes;
	37	unsigned long long bytes;
38	38	unsigned int power = 0;
39	39	double value;

WiredClient/trunk/WCCache.h

r944	r1048
1		/* $Id: WCCache.h,v 1.~~1 2004/03/08 19:23:42~~ morris Exp $ */
	1	/* $Id: WCCache.h,v 1.2 2004/03/24 21:38:21 morris Exp $ */
2	2
3	3	/*
…	…
39	39	- (id) initWithCount:(unsigned int)count;
40	40
41		- (void) setFiles:(NSArray )files free:(~~off_t~~)free forPath:(NSString )path;
	41	- (void) setFiles:(NSArray )files free:(unsigned long long)free forPath:(NSString )path;
42	42	- (void) dropFilesForPath:(NSString *)path;
43		- (NSArray ) filesForPath:(NSString )path free:(~~off_t~~ *)free;
	43	- (NSArray ) filesForPath:(NSString )path free:(unsigned long long *)free;
44	44
45	45	- (void) setFileIcon:(NSImage )icon forExtension:(NSString )extension;

WiredClient/trunk/WCCache.m

r944	r1048
1		/* $Id: WCCache.m,v 1.~~1 2004/03/08 19:23:42~~ morris Exp $ */
	1	/* $Id: WCCache.m,v 1.2 2004/03/24 21:38:21 morris Exp $ */
2	2
3	3	/*
…	…
57	57	#pragma mark -
58	58
59		- (void)setFiles:(NSArray )files free:(~~off_t~~)free forPath:(NSString )path {
	59	- (void)setFiles:(NSArray )files free:(unsigned long long)free forPath:(NSString )path {
60	60	if([_files count] > _count)
61	61	[_files removeObjectForKey:[[_files allKeys] objectAtIndex:0]];
…	…
76	76
77	77
78		- (NSArray )filesForPath:(NSString )path free:(~~off_t~~ *)free {
	78	- (NSArray )filesForPath:(NSString )path free:(unsigned long long *)free {
79	79	*free = [[[_files objectForKey:path] objectAtIndex:1] unsignedLongLongValue];
80	80

WiredClient/trunk/WCFile.h

r944	r1048
1		/* $Id: WCFile.h,v 1.~~1 2004/03/08 19:23:43~~ morris Exp $ */
	1	/* $Id: WCFile.h,v 1.2 2004/03/24 21:38:21 morris Exp $ */
2	2
3	3	/*
…	…
29	29	@interface WCFile : NSObject <NSCoding> {
30	30	unsigned int _type;
31		~~off_t~~ _size;
32		~~off_t~~ _free;
	31	unsigned long long _size;
	32	unsigned long long _free;
33	33	NSString *_path;
34	34	NSString *_name;
…	…
48	48	- (unsigned int) type;
49	49
50		- (void) setSize:(~~off_t~~)value;
51		- (~~off_t)~~ size;
	50	- (void) setSize:(unsigned long long)value;
	51	- (unsigned long long) size;
52	52
53		- (void) setFree:(~~off_t~~)value;
54		- (~~off_t)~~ free;
	53	- (void) setFree:(unsigned long long)value;
	54	- (unsigned long long) free;
55	55
56	56	- (void) setPath:(NSString *)value;

WiredClient/trunk/WCFile.m

r944	r1048
1		/* $Id: WCFile.m,v 1.~~1 2004/03/08 19:23:43~~ morris Exp $ */
	1	/* $Id: WCFile.m,v 1.2 2004/03/24 21:38:21 morris Exp $ */
2	2
3	3	/*
…	…
61	61
62	62	[coder decodeValueOfObjCType:@encode(unsigned int) at:&_type];
63		[coder decodeValueOfObjCType:@encode(~~off_t~~) at:&_size];
64		[coder decodeValueOfObjCType:@encode(~~off_t~~) at:&_free];
	63	[coder decodeValueOfObjCType:@encode(unsigned long long) at:&_size];
	64	[coder decodeValueOfObjCType:@encode(unsigned long long) at:&_free];
65	65
66	66	_path = [[coder decodeObject] retain];
…	…
75	75	- (void)encodeWithCoder:(NSCoder *)coder {
76	76	[coder encodeValueOfObjCType:@encode(unsigned int) at:&_type];
77		[coder encodeValueOfObjCType:@encode(~~off_t~~) at:&_size];
78		[coder encodeValueOfObjCType:@encode(~~off_t~~) at:&_free];
	77	[coder encodeValueOfObjCType:@encode(unsigned long long) at:&_size];
	78	[coder encodeValueOfObjCType:@encode(unsigned long long) at:&_free];
79	79
80	80	[coder encodeObject:_path];
…	…
101	101	#pragma mark -
102	102
103		- (void)setSize:(~~off_t~~)value {
	103	- (void)setSize:(unsigned long long)value {
104	104	_size = value;
105	105	}
…	…
107	107
108	108
109		- (~~off_t~~)size {
	109	- (unsigned long long)size {
110	110	return _size;
111	111	}
…	…
115	115	#pragma mark -
116	116
117		- (void)setFree:(~~off_t~~)value {
	117	- (void)setFree:(unsigned long long)value {
118	118	_free = value;
119	119	}
…	…
121	121
122	122
123		- (~~off_t~~)free {
	123	- (unsigned long long)free {
124	124	return _free;
125	125	}

WiredClient/trunk/WCFileInfo.m

r951	r1048
1		/* $Id: WCFileInfo.m,v 1.~~2 2004/03/11 00:00:28~~ morris Exp $ */
	1	/* $Id: WCFileInfo.m,v 1.3 2004/03/24 21:38:21 morris Exp $ */
2	2
3	3	/*
…	…
137	137
138	138	- (void)fileInfoShouldShowInfo:(NSNotification *)notification {
139		NSArray *fields;
140		NSString argument, size, type, created, modified, checksum, *path;
141		NSScanner *scanner;
142		NSImage *icon = NULL;
143		NSRect rect;
144		WCConnection *connection;
145		~~off_t~~ size_l;
146		int last = 4;
	139	NSArray *fields;
	140	NSString argument, size, type, created, modified, checksum, *path;
	141	NSScanner *scanner;
	142	NSImage *icon = NULL;
	143	NSRect rect;
	144	WCConnection *connection;
	145	unsigned long long size_l;
	146	int last = 4;
147	147
148	148	// --- get parameters

WiredClient/trunk/WCFiles.m

r1037	r1048
1		/* $Id: WCFiles.m,v 1.~~5 2004/03/18 18:14:37~~ morris Exp $ */
	1	/* $Id: WCFiles.m,v 1.6 2004/03/24 21:38:21 morris Exp $ */
2	2
3	3	/*
…	…
180	180
181	181	- (void)filesShouldAddFile:(NSNotification *)notification {
182		NSString argument, size, type, path;
183		NSArray *fields;
184		NSScanner *scanner;
185		WCFile *file;
186		WCConnection *connection;
187		~~off_t~~ size_l;
	182	NSString argument, size, type, path;
	183	NSArray *fields;
	184	NSScanner *scanner;
	185	WCFile *file;
	186	WCConnection *connection;
	187	unsigned long long size_l;
188	188
189	189	// --- get objects
…	…
222	222
223	223	- (void)filesShouldCompleteFiles:(NSNotification *)notification {
224		NSString argument, path, *free;
225		NSArray *fields;
226		NSScanner *scanner;
227		WCConnection *connection;
228		~~off_t~~ free_l;
	224	NSString argument, path, *free;
	225	NSArray *fields;
	226	NSScanner *scanner;
	227	WCConnection *connection;
	228	unsigned long long free_l;
229	229
230	230	// --- get objects
…	…
355	355	NSEnumerator *enumerator;
356	356	WCFile *file;
357		~~off_t~~ size = 0;
	357	unsigned long long size = 0;
358	358	int i = 0, row = -1;
359	359
…	…
428	428
429	429	- (void)changeDirectory:(WCFile *)path {
430		NSArray *cache;
431		~~off_t~~ free;
	430	NSArray *cache;
	431	unsigned long long free;
432	432
433	433	// --- copy path

WiredClient/trunk/WCSearch.m

r1037	r1048
1		/* $Id: WCSearch.m,v 1.~~3 2004/03/18 18:14:37~~ morris Exp $ */
	1	/* $Id: WCSearch.m,v 1.4 2004/03/24 21:38:21 morris Exp $ */
2	2
3	3	/*
…	…
173	173
174	174	- (void)searchShouldAddFile:(NSNotification *)notification {
175		NSString argument, size, type, path;
176		NSArray *fields;
177		NSString *extension;
178		NSScanner *scanner;
179		WCFile *file;
180		WCConnection *connection;
181		~~off_t~~ size_l;
182		BOOL add = NO;
	175	NSString argument, size, type, path;
	176	NSArray *fields;
	177	NSString *extension;
	178	NSScanner *scanner;
	179	WCFile *file;
	180	WCConnection *connection;
	181	unsigned long long size_l;
	182	BOOL add = NO;
183	183
184	184	// --- get objects
…	…
253	253	WCFile *file;
254	254	WCConnection *connection;
255		~~off_t~~ size = 0;
	255	unsigned long long size = 0;
256	256
257	257	// --- get objects

WiredClient/trunk/WCServerInfo.m

r1037	r1048
1		/* $Id: WCServerInfo.m,v 1.~~4 2004/03/18 18:14:37~~ morris Exp $ */
	1	/* $Id: WCServerInfo.m,v 1.5 2004/03/24 21:38:21 morris Exp $ */
2	2
3	3	/*
…	…
225	225
226	226	- (void)serverInfoShouldShowBanner:(NSNotification *)notification {
227		NSString *path;
228		NSImage *banner = NULL;
229		WCConnection *connection;
230		NSRect rect;
231		~~off_t~~ size = 0;
	227	NSString *path;
	228	NSImage *banner = NULL;
	229	WCConnection *connection;
	230	NSRect rect;
	231	unsigned long long size = 0;
232	232
233	233	// --- get parameters

WiredClient/trunk/WCTransfer.h

r944	r1048
1		/* $Id: WCTransfer.h,v 1.~~1 2004/03/08 19:23:43~~ morris Exp $ */
	1	/* $Id: WCTransfer.h,v 1.2 2004/03/24 21:38:21 morris Exp $ */
2	2
3	3	/*
…	…
37	37	unsigned int _queue;
38	38	unsigned int _speed;
39		~~off_t~~ _offset;
40		~~off_t~~ _size;
41		~~off_t~~ _transferred;
	39	unsigned long long _offset;
	40	unsigned long long _size;
	41	unsigned long long _transferred;
42	42	BOOL _preview;
43	43	BOOL _progressInited;
…	…
83	83	- (unsigned int) speed;
84	84
85		- (void) setOffset:(~~off_t~~)value;
86		- (~~off_t)~~ offset;
	85	- (void) setOffset:(unsigned long long)value;
	86	- (unsigned long long) offset;
87	87
88		- (void) setSize:(~~off_t~~)value;
89		- (~~off_t)~~ size;
	88	- (void) setSize:(unsigned long long)value;
	89	- (unsigned long long) size;
90	90
91		- (void) setTransferred:(~~off_t~~)value;
92		- (~~off_t)~~ transferred;
	91	- (void) setTransferred:(unsigned long long)value;
	92	- (unsigned long long) transferred;
93	93
94	94	- (void) setPreview:(BOOL)value;

WiredClient/trunk/WCTransfer.m

r944	r1048
1		/* $Id: WCTransfer.m,v 1.~~1 2004/03/08 19:23:43~~ morris Exp $ */
	1	/* $Id: WCTransfer.m,v 1.2 2004/03/24 21:38:21 morris Exp $ */
2	2
3	3	/*
…	…
76	76	[coder decodeValueOfObjCType:@encode(unsigned int) at:&_queue];
77	77	[coder decodeValueOfObjCType:@encode(unsigned int) at:&_speed];
78		[coder decodeValueOfObjCType:@encode(~~off_t~~) at:&_offset];
79		[coder decodeValueOfObjCType:@encode(~~off_t~~) at:&_size];
80		[coder decodeValueOfObjCType:@encode(~~off_t~~) at:&_transferred];
	78	[coder decodeValueOfObjCType:@encode(unsigned long long) at:&_offset];
	79	[coder decodeValueOfObjCType:@encode(unsigned long long) at:&_size];
	80	[coder decodeValueOfObjCType:@encode(unsigned long long) at:&_transferred];
81	81	[coder decodeValueOfObjCType:@encode(BOOL) at:&_preview];
82	82	[coder decodeValueOfObjCType:@encode(BOOL) at:&_progressInited];
…	…
125	125
126	126	- (NSString *)status {
127		~~off_t~~ remaining;
128		int time;
	127	unsigned long long remaining;
	128	int time;
129	129
130	130	switch([self state]) {
…	…
246	246	#pragma mark -
247	247
248		- (void)setSize:(~~off_t~~)value {
	248	- (void)setSize:(unsigned long long)value {
249	249	_size = value;
250	250	}
…	…
252	252
253	253
254		- (~~off_t~~)size {
	254	- (unsigned long long)size {
255	255	return _size;
256	256	}
…	…
260	260	#pragma mark -
261	261
262		- (void)setOffset:(~~off_t~~)value {
	262	- (void)setOffset:(unsigned long long)value {
263	263	_offset = value;
264	264	}
…	…
266	266
267	267
268		- (~~off_t~~)offset {
	268	- (unsigned long long)offset {
269	269	return _offset;
270	270	}
…	…
274	274	#pragma mark -
275	275
276		- (void)setTransferred:(~~off_t~~)value {
	276	- (void)setTransferred:(unsigned long long)value {
277	277	_transferred = value;
278	278	}
…	…
280	280
281	281
282		- (~~off_t~~)transferred {
	282	- (unsigned long long)transferred {
283	283	return _transferred;
284	284	}

WiredClient/trunk/WCTransfers.m

r1037	r1048
1		/* $Id: WCTransfers.m,v 1.~~4 2004/03/18 18:14:37~~ morris Exp $ */
	1	/* $Id: WCTransfers.m,v 1.5 2004/03/24 21:38:21 morris Exp $ */
2	2
3	3	/*
…	…
198	198
199	199	- (void)transfersShouldStartTransfer:(NSNotification *)notification {
200		NSArray *fields;
201		NSEnumerator *enumerator;
202		NSString argument, offset, hash, path;
203		NSScanner *scanner;
204		WCConnection *connection;
205		WCTransfer each, transfer = NULL;
206		~~off_t~~ offset_l;
	200	NSArray *fields;
	201	NSEnumerator *enumerator;
	202	NSString argument, offset, hash, path;
	203	NSScanner *scanner;
	204	WCConnection *connection;
	205	WCTransfer each, transfer = NULL;
	206	unsigned long long offset_l;
207	207
208	208	// --- get parameters
…	…
332	332	WCConnection *connection;
333	333	WCTransfer each, transfer;
334		~~off_t~~ size = 0;
	334	unsigned long long size = 0;
335	335
336	336	// --- get parameters
…	…
411	411
412	412	- (void)filesShouldAddFile:(NSNotification *)notification {
413		NSString argument, size, type, path, *localPath;
414		NSArray *fields;
415		NSScanner *scanner;
416		WCFile *file;
417		WCConnection *connection;
418		~~off_t~~ size_l;
	413	NSString argument, size, type, path, *localPath;
	414	NSArray *fields;
	415	NSScanner *scanner;
	416	WCFile *file;
	417	WCConnection *connection;
	418	unsigned long long size_l;
419	419
420	420	if(!_recursiveTransfer)
…	…
771	771	NSString *checksum;
772	772	WCFile *file;
773		~~off_t~~ size;
	773	unsigned long long size;
774	774
775	775	// --- open local file
…	…
808	808	NSString *checksum;
809	809	WCFile *file;
810		~~off_t~~ size;
	810	unsigned long long size;
811	811
812	812	// --- open local file
…	…
885	885	BOOL running = YES;
886	886	long elapsed;
887		~~off_t~~ transferred;
	887	unsigned long long transferred;
888	888	int bytes = 0, lastBytes = 0, speed, maxSpeed = 0, shiftStatus;
889	889

WiredClient/trunk/WCUserInfo.m

r1047	r1048
1		/* $Id: WCUserInfo.m,v 1.~~4 2004/03/24 16:39:0~~1 morris Exp $ */
	1	/* $Id: WCUserInfo.m,v 1.5 2004/03/24 21:38:21 morris Exp $ */
2	2
3	3	/*
…	…
284	284	NSString path, transferred, size, speed;
285	285	NSScanner *scanner;
286		~~off_t~~ transferred_l, size_l;
	286	unsigned long long transferred_l, size_l;
287	287
288	288	// --- split fields

Navigation

Changeset 1048

Legend:

Download in other formats: