ObjFW  Diff

Differences From Artifact [48162efaaf]:

To Artifact [17a63459d4]:


70
71
72
73
74
75
76




77
78
79
80
81
82
83
- (size_t)OF_getCString: (char*)cString
	      maxLength: (size_t)maxLength
	       encoding: (of_string_encoding_t)encoding
		  lossy: (bool)lossy;
- (const char*)OF_cStringWithEncoding: (of_string_encoding_t)encoding
				lossy: (bool)lossy;
@end





/* References for static linking */
void _references_to_categories_of_OFString(void)
{
	_OFString_Hashing_reference = 1;
	_OFString_JSONValue_reference = 1;
	_OFString_Serialization_reference = 1;







>
>
>
>







70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
- (size_t)OF_getCString: (char*)cString
	      maxLength: (size_t)maxLength
	       encoding: (of_string_encoding_t)encoding
		  lossy: (bool)lossy;
- (const char*)OF_cStringWithEncoding: (of_string_encoding_t)encoding
				lossy: (bool)lossy;
@end

extern bool of_unicode_to_iso_8859_15(const of_unichar_t*, char*, size_t, bool);
extern bool of_unicode_to_windows_1252(const of_unichar_t*, char*, size_t,
    bool);

/* References for static linking */
void _references_to_categories_of_OFString(void)
{
	_OFString_Hashing_reference = 1;
	_OFString_JSONValue_reference = 1;
	_OFString_Serialization_reference = 1;
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
		cString[i] = '\0';

		return length;
	case OF_STRING_ENCODING_ISO_8859_15:
		if (length + 1 > maxLength)
			@throw [OFOutOfRangeException exception];

		for (i = 0; i < length; i++) {
			of_unichar_t c = characters[i];

			switch (c) {
			case 0xA4:
			case 0xA6:
			case 0xA8:
			case 0xB4:
			case 0xB8:
			case 0xBC:
			case 0xBD:
			case 0xBE:
				if (lossy)
					cString[i] = '?';
				else
					@throw [OFInvalidEncodingException
					    exception];

				break;
			}

			if OF_UNLIKELY (c > 0xFF) {
				switch (c) {
				case 0x20AC:
					cString[i] = 0xA4;
					break;
				case 0x160:
					cString[i] = 0xA6;
					break;
				case 0x161:
					cString[i] = 0xA8;
					break;
				case 0x17D:
					cString[i] = 0xB4;
					break;
				case 0x17E:
					cString[i] = 0xB8;
					break;
				case 0x152:
					cString[i] = 0xBC;
					break;
				case 0x153:
					cString[i] = 0xBD;
					break;
				case 0x178:
					cString[i] = 0xBE;
					break;
				default:
					if (lossy)
						cString[i] = '?';
					else
						@throw
						    [OFInvalidEncodingException
						    exception];

					break;
				}
			} else
				cString[i] = (uint8_t)c;
		}

		cString[i] = '\0';

		return length;
	case OF_STRING_ENCODING_WINDOWS_1252:
		if (length + 1 > maxLength)
			@throw [OFOutOfRangeException exception];

		for (i = 0; i < length; i++) {
			of_unichar_t c = characters[i];

			if OF_UNLIKELY (c >= 0x80 && c <= 0x9F) {
				if (lossy)
					cString[i] = '?';
				else
					@throw [OFInvalidEncodingException
					    exception];
			}

			if OF_UNLIKELY (c > 0xFF) {
				switch (c) {
				case 0x20AC:
					cString[i] = 0x80;
					break;
				case 0x201A:
					cString[i] = 0x82;
					break;
				case 0x192:
					cString[i] = 0x83;
					break;
				case 0x201E:
					cString[i] = 0x84;
					break;
				case 0x2026:
					cString[i] = 0x85;
					break;
				case 0x2020:
					cString[i] = 0x86;
					break;
				case 0x2021:
					cString[i] = 0x87;
					break;
				case 0x2C6:
					cString[i] = 0x88;
					break;
				case 0x2030:
					cString[i] = 0x89;
					break;
				case 0x160:
					cString[i] = 0x8A;
					break;
				case 0x2039:
					cString[i] = 0x8B;
					break;
				case 0x152:
					cString[i] = 0x8C;
					break;
				case 0x17D:
					cString[i] = 0x8E;
					break;
				case 0x2018:
					cString[i] = 0x91;
					break;
				case 0x2019:
					cString[i] = 0x92;
					break;
				case 0x201C:
					cString[i] = 0x93;
					break;
				case 0x201D:
					cString[i] = 0x94;
					break;
				case 0x2022:
					cString[i] = 0x95;
					break;
				case 0x2013:
					cString[i] = 0x96;
					break;
				case 0x2014:
					cString[i] = 0x97;
					break;
				case 0x2DC:
					cString[i] = 0x98;
					break;
				case 0x2122:
					cString[i] = 0x99;
					break;
				case 0x161:
					cString[i] = 0x9A;
					break;
				case 0x203A:
					cString[i] = 0x9B;
					break;
				case 0x153:
					cString[i] = 0x9C;
					break;
				case 0x17E:
					cString[i] = 0x9E;
					break;
				case 0x178:
					cString[i] = 0x9F;
					break;
				default:
					if (lossy)
						cString[i] = '?';
					else
						@throw
						    [OFInvalidEncodingException
						    exception];

					break;
				}
			} else
				cString[i] = (uint8_t)c;
		}

		cString[i] = '\0';

		return length;
	default:
		@throw [OFNotImplementedException exceptionWithSelector: _cmd
								 object: self];
	}
}







<
<
|
<
<
<
<
<
<
<
<
<
|
<
<
|
<

<
<
<
<
<
<
|
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<






<
<
|
<
|
<
<
|
<
|
<
<
<
<
|
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<







1060
1061
1062
1063
1064
1065
1066


1067









1068


1069

1070






1071





































1072
1073
1074
1075
1076
1077


1078

1079


1080

1081




1082






























































































1083
1084
1085
1086
1087
1088
1089
		cString[i] = '\0';

		return length;
	case OF_STRING_ENCODING_ISO_8859_15:
		if (length + 1 > maxLength)
			@throw [OFOutOfRangeException exception];



		if (!of_unicode_to_iso_8859_15(characters, cString, length,









		    lossy))


			@throw [OFInvalidEncodingException exception];








		cString[length] = '\0';






































		return length;
	case OF_STRING_ENCODING_WINDOWS_1252:
		if (length + 1 > maxLength)
			@throw [OFOutOfRangeException exception];



		if (!of_unicode_to_windows_1252(characters, cString, length,

		    lossy))


			@throw [OFInvalidEncodingException exception];






		cString[length] = '\0';































































































		return length;
	default:
		@throw [OFNotImplementedException exceptionWithSelector: _cmd
								 object: self];
	}
}