ObjFW  Check-in [9759533b97]

Overview
Comment:Add #undefs in OFHashes.

Just to be sure that we won't get any conflicts when someone addes new
hashes.

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 9759533b974d19fd14412769f6a38817bdc795e29afad8964cfb898572d7d150
User & Date: js on 2008-10-28 18:19:15
Other Links: manifest | tags
Context
2008-10-28
19:00
Better overflow checking. check-in: 2aaab788cc user: js tags: trunk
18:19
Add #undefs in OFHashes. check-in: 9759533b97 user: js tags: trunk
2008-10-26
20:54
Return self when we have no return value. This allows nesting. check-in: 8ae4c59cd6 user: js tags: trunk
Changes

Modified src/OFCString.h from [61914d08b2] to [ed35d22672].

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
/*
 * Copyright (c) 2008
 *   Jonathan Schleifer <js@webkeks.org>
 *
 * All rights reserved.
 *
 * This file is part of libobjfw. It may be distributed under the terms of the
 * Q Public License 1.0, which can be found in the file LICENSE included in
 * the packaging of this file.
 */

#import <stddef.h>

#import "OFObject.h"
#import "OFString.h"

@interface OFCString: OFString
{
	char   *string;
	size_t length;
}













<







1
2
3
4
5
6
7
8
9
10
11
12
13

14
15
16
17
18
19
20
/*
 * Copyright (c) 2008
 *   Jonathan Schleifer <js@webkeks.org>
 *
 * All rights reserved.
 *
 * This file is part of libobjfw. It may be distributed under the terms of the
 * Q Public License 1.0, which can be found in the file LICENSE included in
 * the packaging of this file.
 */

#import <stddef.h>


#import "OFString.h"

@interface OFCString: OFString
{
	char   *string;
	size_t length;
}

Modified src/OFHashes.m from [6a70fca031] to [ae5d03b1b4].

251
252
253
254
255
256
257






258
259
260
261
262
263
264

	calculated = YES;

	return (uint8_t*)buf;
}
@end







/********
 * SHA1 *
 ********/

/* blk0() and blk() perform the initial expand. */
#ifndef OF_BIG_ENDIAN
#define blk0(i)							\







>
>
>
>
>
>







251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270

	calculated = YES;

	return (uint8_t*)buf;
}
@end

#undef F1
#undef F2
#undef F3
#undef F4
#undef MD5STEP

/********
 * SHA1 *
 ********/

/* blk0() and blk() perform the initial expand. */
#ifndef OF_BIG_ENDIAN
#define blk0(i)							\
410
411
412
413
414
415
416








	for (i = 0; i < SHA1_DIGEST_SIZE; i++)
		digest[i] = (uint8_t)((state[i >> 2] >>
		    ((3 - (i & 3)) * 8)) & 255);

	return digest;
}
@end















>
>
>
>
>
>
>
>
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
	for (i = 0; i < SHA1_DIGEST_SIZE; i++)
		digest[i] = (uint8_t)((state[i >> 2] >>
		    ((3 - (i & 3)) * 8)) & 255);

	return digest;
}
@end

#undef blk0
#undef blk
#undef R0
#undef R1
#undef R2
#undef R3
#undef R4

Modified src/OFString.h from [a2a6f02dc3] to [71a7d2b095].

1
2
3
4
5
6
7
8
9
10
11
12
13

14
15
16
17
18
19
20
/*
 * Copyright (c) 2008
 *   Jonathan Schleifer <js@webkeks.org>
 *
 * All rights reserved.
 *
 * This file is part of libobjfw. It may be distributed under the terms of the
 * Q Public License 1.0, which can be found in the file LICENSE included in
 * the packaging of this file.
 */

#import <wchar.h>
#import <stddef.h>

#import "OFObject.h"

@interface OFString: OFObject
+ newAsConstCString: (const char*)str;
+ newAsConstWideCString: (const wchar_t*)str;
+ newAsCString: (char*)str;
+ newAsWideCString: (wchar_t*)str;













>







1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
/*
 * Copyright (c) 2008
 *   Jonathan Schleifer <js@webkeks.org>
 *
 * All rights reserved.
 *
 * This file is part of libobjfw. It may be distributed under the terms of the
 * Q Public License 1.0, which can be found in the file LICENSE included in
 * the packaging of this file.
 */

#import <wchar.h>
#import <stddef.h>

#import "OFObject.h"

@interface OFString: OFObject
+ newAsConstCString: (const char*)str;
+ newAsConstWideCString: (const wchar_t*)str;
+ newAsCString: (char*)str;
+ newAsWideCString: (wchar_t*)str;