Bump version.

[thirdparty/cups.git] / cups / file.h

diff --git a/cups/file.h b/cups/file.h
index 5f02b5c91078bff8123dd8d8875a037dd0620e01..49ca58a0c4e585ecf7dc151af9212fcc4cceca7c 100644 (file)
--- a/cups/file.h
+++ b/cups/file.h
@@ -1,21 +1,16 @@
 /*
- * "$Id: file.h 7460 2008-04-16 02:19:54Z mike $"
+ * Public file definitions for CUPS.
  *
- *   Public file definitions for CUPS.
+ * Since stdio files max out at 256 files on many systems, we have to
+ * write similar functions without this limit.  At the same time, using
+ * our own file functions allows us to provide transparent support of
+ * different line endings, gzip'd print files, PPD files, etc.
  *
- *   Since stdio files max out at 256 files on many systems, we have to
- *   write similar functions without this limit.  At the same time, using
- *   our own file functions allows us to provide transparent support of
- *   gzip'd print files, PPD files, etc.
+ * Copyright © 2007-2018 by Apple Inc.
+ * Copyright © 1997-2007 by Easy Software Products, all rights reserved.
  *
- *   Copyright 2007-2011 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ * Licensed under Apache License v2.0.  See the file "LICENSE" for more
+ * information.
  */
 
 #ifndef _CUPS_FILE_H_
@@ -29,11 +24,11 @@
 #  include "versioning.h"
 #  include <stddef.h>
 #  include <sys/types.h>
-#  if defined(WIN32) && !defined(__CUPS_SSIZE_T_DEFINED)
+#  if defined(_WIN32) && !defined(__CUPS_SSIZE_T_DEFINED)
 #    define __CUPS_SSIZE_T_DEFINED
 /* Windows does not support the ssize_t type, so map it to off_t... */
 typedef off_t ssize_t;                 /* @private@ */
-#  endif /* WIN32 && !__CUPS_SSIZE_T_DEFINED */
+#  endif /* _WIN32 && !__CUPS_SSIZE_T_DEFINED */
 
 
 /*
@@ -67,29 +62,20 @@ typedef struct _cups_file_s cups_file_t;/**** CUPS file type ****/
 extern int             cupsFileClose(cups_file_t *fp) _CUPS_API_1_2;
 extern int             cupsFileCompression(cups_file_t *fp) _CUPS_API_1_2;
 extern int             cupsFileEOF(cups_file_t *fp) _CUPS_API_1_2;
-extern const char      *cupsFileFind(const char *filename, const char *path,
-                                     int executable, char *buffer,
-                                     int bufsize) _CUPS_API_1_2;
+extern const char      *cupsFileFind(const char *filename, const char *path, int executable, char *buffer, int bufsize) _CUPS_API_1_2;
 extern int             cupsFileFlush(cups_file_t *fp) _CUPS_API_1_2;
 extern int             cupsFileGetChar(cups_file_t *fp) _CUPS_API_1_2;
-extern char            *cupsFileGetConf(cups_file_t *fp, char *buf, size_t buflen,
-                                        char **value, int *linenum) _CUPS_API_1_2;
-extern size_t          cupsFileGetLine(cups_file_t *fp, char *buf,
-                                       size_t buflen) _CUPS_API_1_2;
+extern char            *cupsFileGetConf(cups_file_t *fp, char *buf, size_t buflen, char **value, int *linenum) _CUPS_API_1_2;
+extern size_t          cupsFileGetLine(cups_file_t *fp, char *buf, size_t buflen) _CUPS_API_1_2;
 extern char            *cupsFileGets(cups_file_t *fp, char *buf, size_t buflen) _CUPS_API_1_2;
 extern int             cupsFileLock(cups_file_t *fp, int block) _CUPS_API_1_2;
 extern int             cupsFileNumber(cups_file_t *fp) _CUPS_API_1_2;
 extern cups_file_t     *cupsFileOpen(const char *filename, const char *mode) _CUPS_API_1_2;
 extern cups_file_t     *cupsFileOpenFd(int fd, const char *mode) _CUPS_API_1_2;
 extern int             cupsFilePeekChar(cups_file_t *fp) _CUPS_API_1_2;
-extern int             cupsFilePrintf(cups_file_t *fp, const char *format, ...)
-#ifdef __GNUC__
-__attribute__ ((__format__ (__printf__, 2, 3)))
-#endif /* __GNUC__ */
-_CUPS_API_1_2;
+extern int             cupsFilePrintf(cups_file_t *fp, const char *format, ...) _CUPS_FORMAT(2, 3) _CUPS_API_1_2;
 extern int             cupsFilePutChar(cups_file_t *fp, int c) _CUPS_API_1_2;
-extern ssize_t         cupsFilePutConf(cups_file_t *fp, const char *directive,
-                                       const char *value) _CUPS_API_1_4;
+extern ssize_t         cupsFilePutConf(cups_file_t *fp, const char *directive, const char *value) _CUPS_API_1_4;
 extern int             cupsFilePuts(cups_file_t *fp, const char *s) _CUPS_API_1_2;
 extern ssize_t         cupsFileRead(cups_file_t *fp, char *buf, size_t bytes) _CUPS_API_1_2;
 extern off_t           cupsFileRewind(cups_file_t *fp) _CUPS_API_1_2;
@@ -106,7 +92,3 @@ extern ssize_t               cupsFileWrite(cups_file_t *fp, const char *buf, size_t bytes) _C
 }
 #  endif /* __cplusplus */
 #endif /* !_CUPS_FILE_H_ */
-
-/*
- * End of "$Id: file.h 7460 2008-04-16 02:19:54Z mike $".
- */