Media size matching now uses a tolerance of 0.5mm (rdar://33822024)

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

diff --git a/cups/file.h b/cups/file.h
index 42abe2086df5049f9a80ae96efcf63322e294e1d..49ca58a0c4e585ecf7dc151af9212fcc4cceca7c 100644 (file)
--- a/cups/file.h
+++ b/cups/file.h
@@ -6,16 +6,11 @@
  * our own file functions allows us to provide transparent support of
  * different line endings, gzip'd print files, PPD files, etc.
  *
- * Copyright 2007-2017 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ * Copyright © 2007-2018 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
- * missing or damaged, see the license at "http://www.cups.org/".
- *
- * This file is subject to the Apple OS-Developed Software exception.
+ * 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,34 +62,22 @@ 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            *cupsFileGets(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     *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, ...)
-                       __attribute__((__format__ (__printf__, 2, 3)))
-                       _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 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 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;
 extern off_t           cupsFileSeek(cups_file_t *fp, off_t pos) _CUPS_API_1_2;
 extern cups_file_t     *cupsFileStderr(void) _CUPS_API_1_2;
@@ -102,8 +85,7 @@ extern cups_file_t   *cupsFileStdin(void) _CUPS_API_1_2;
 extern cups_file_t     *cupsFileStdout(void) _CUPS_API_1_2;
 extern off_t           cupsFileTell(cups_file_t *fp) _CUPS_API_1_2;
 extern int             cupsFileUnlock(cups_file_t *fp) _CUPS_API_1_2;
-extern ssize_t         cupsFileWrite(cups_file_t *fp, const char *buf,
-                                     size_t bytes) _CUPS_API_1_2;
+extern ssize_t         cupsFileWrite(cups_file_t *fp, const char *buf, size_t bytes) _CUPS_API_1_2;
 
 
 #  ifdef __cplusplus