ObjFW  Diff

Differences From Artifact [247677c877]:

• File src/OFZIPArchiveEntry.h — part of check-in [9e76144ef8] at 2015-06-13 22:26:05 on branch trunk — Add support for and use the new nullability (user: js, size: 7021) [annotate] [blame] [check-ins using]

To Artifact [c1f79ae163]:

• File src/OFZIPArchiveEntry.h — part of check-in [b7097a67b6] at 2015-06-14 10:45:10 on branch trunk — Add OF_NONNULL / OF_NULLABLE and use that instead

  Using __nonnull directly doesn't work on systems using glibc, as glibc
  defines __nonnull as a parameterized define. While this does not fix the
  problem of Clang introducing __nonnull even though it conflicts with
  glibc, this at least means it's possible again to compile things with
  versions of Clang that don't support __nonnull on systems with glibc. (user: js, size: 7013) [annotate] [blame] [check-ins using]

231
232
233
234
235
236
237
238
239
240
241
242
243

 *		     the specified tag
 * @param tag The tag to look for
 * @param data A pointer to a pointer that should be set to the start of the
 *	       extra field with the specified tag
 * @param size A pointer to an uint16_t that should be set to the size
 */
extern void of_zip_archive_entry_extra_field_find(OFDataArray *extraField,
    uint16_t tag, __nonnull uint8_t **__nonnull data, __nonnull uint16_t *size);
#ifdef __cplusplus
}
#endif

OF_ASSUME_NONNULL_END

|

231
232
233
234
235
236
237
238
239
240
241
242
243

 *		     the specified tag
 * @param tag The tag to look for
 * @param data A pointer to a pointer that should be set to the start of the
 *	       extra field with the specified tag
 * @param size A pointer to an uint16_t that should be set to the size
 */
extern void of_zip_archive_entry_extra_field_find(OFDataArray *extraField,
    uint16_t tag, uint8_t *OF_NONNULL *OF_NONNULL data, uint16_t *size);
#ifdef __cplusplus
}
#endif

OF_ASSUME_NONNULL_END