X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=cups%2Flanguage-private.h;h=7c304dfca7369fa7dd57d7063fb34ace43e2d580;hb=f05517caabee68aa069fa258522b9cba7ccee917;hp=cf5b482b4357c7de2a653bd43cd90243e260129f;hpb=a29fd7ddb5d63688a4d44d08e4ab16428921c321;p=thirdparty%2Fcups.git

diff --git a/cups/language-private.h b/cups/language-private.h
index cf5b482b4..7c304dfca 100644
--- a/cups/language-private.h
+++ b/cups/language-private.h
@@ -1,18 +1,11 @@
 /*
- * "$Id$"
+ * Private localization support for CUPS.
  *
- *   Private localization support for CUPS.
+ * Copyright © 2007-2018 by Apple Inc.
+ * Copyright © 1997-2006 by Easy Software Products.
  *
- *   Copyright 2007-2010 by Apple Inc.
- *   Copyright 1997-2006 by Easy Software Products.
- *
- *   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/".
- *
- *   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_LANGUAGE_PRIVATE_H_
@@ -22,8 +15,12 @@
  * Include necessary headers...
  */
 
+#  include "config.h"
 #  include <stdio.h>
 #  include <cups/transcode.h>
+#  ifdef __APPLE__
+#    include <CoreFoundation/CoreFoundation.h>
+#  endif /* __APPLE__ */
 
 #  ifdef __cplusplus
 extern "C" {
@@ -37,13 +34,23 @@ extern "C" {
 #  define _(x) x
 
 
+/*
+ * Constants...
+ */
+
+#  define _CUPS_MESSAGE_PO	0	/* Message file is in GNU .po format */
+#  define _CUPS_MESSAGE_UNQUOTE	1	/* Unescape \foo in strings? */
+#  define _CUPS_MESSAGE_STRINGS	2	/* Message file is in Apple .strings format */
+#  define _CUPS_MESSAGE_EMPTY	4	/* Allow empty localized strings */
+
+
 /*
  * Types...
  */
 
 typedef struct _cups_message_s		/**** Message catalog entry ****/
 {
-  char	*id,				/* Original string */
+  char	*msg,				/* Original string */
 	*str;				/* Localized string */
 } _cups_message_t;
 
@@ -53,26 +60,22 @@ typedef struct _cups_message_s		/**** Message catalog entry ****/
  */
 
 #  ifdef __APPLE__
-extern const char	*_cupsAppleLanguage(const char *locale, char *language,
-			                    size_t langsize);
+extern const char	*_cupsAppleLanguage(const char *locale, char *language, size_t langsize) _CUPS_PRIVATE;
+extern const char	*_cupsAppleLocale(CFStringRef languageName, char *locale, size_t localesize) _CUPS_PRIVATE;
 #  endif /* __APPLE__ */
-extern void		_cupsCharmapFlush(void);
-extern const char	*_cupsEncodingName(cups_encoding_t encoding);
-extern void		_cupsLangPrintError(const char *prefix,
-			                    const char *message);
-extern int		_cupsLangPrintFilter(FILE *fp, const char *prefix,
-			                     const char *message, ...)
-			__attribute__ ((__format__ (__printf__, 3, 4)));
-extern int		_cupsLangPrintf(FILE *fp, const char *message, ...)
-			__attribute__ ((__format__ (__printf__, 2, 3)));
-extern int		_cupsLangPuts(FILE *fp, const char *message);
-extern const char	*_cupsLangString(cups_lang_t *lang,
-			                 const char *message);
-extern void		_cupsMessageFree(cups_array_t *a);
-extern cups_array_t	*_cupsMessageLoad(const char *filename, int unquote);
-extern const char	*_cupsMessageLookup(cups_array_t *a, const char *m);
-extern cups_array_t	*_cupsMessageNew(void *context);
-extern void		_cupsSetLocale(char *argv[]);
+extern void		_cupsCharmapFlush(void) _CUPS_INTERNAL;
+extern const char	*_cupsEncodingName(cups_encoding_t encoding) _CUPS_PRIVATE;
+extern void		_cupsLangPrintError(const char *prefix, const char *message) _CUPS_PRIVATE;
+extern int		_cupsLangPrintFilter(FILE *fp, const char *prefix, const char *message, ...) _CUPS_FORMAT(3, 4) _CUPS_PRIVATE;
+extern int		_cupsLangPrintf(FILE *fp, const char *message, ...) _CUPS_FORMAT(2, 3) _CUPS_PRIVATE;
+extern int		_cupsLangPuts(FILE *fp, const char *message) _CUPS_PRIVATE;
+extern const char	*_cupsLangString(cups_lang_t *lang, const char *message) _CUPS_PRIVATE;
+extern void		_cupsMessageFree(cups_array_t *a) _CUPS_PRIVATE;
+extern cups_array_t	*_cupsMessageLoad(const char *filename, int flags) _CUPS_PRIVATE;
+extern const char	*_cupsMessageLookup(cups_array_t *a, const char *m) _CUPS_PRIVATE;
+extern cups_array_t	*_cupsMessageNew(void *context) _CUPS_PRIVATE;
+extern int		_cupsMessageSave(const char *filename, int flags, cups_array_t *a) _CUPS_PRIVATE;
+extern void		_cupsSetLocale(char *argv[]) _CUPS_PRIVATE;
 
 
 #  ifdef __cplusplus
@@ -80,7 +83,3 @@ extern void		_cupsSetLocale(char *argv[]);
 #  endif /* __cplusplus */
 
 #endif /* !_CUPS_LANGUAGE_PRIVATE_H_ */
-
-/*
- * End of "$Id$".
- */