From 8072030b3c862315c367c73663b27f0427325919 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Mon, 20 Jun 2016 15:23:25 -0400 Subject: [PATCH] Update all references to OS X to macOS. --- CHANGES.txt | 2 +- CONTRIBUTING.md | 6 +- INSTALL.txt | 4 +- LICENSE.txt | 6 +- Makefile | 9 +- config-scripts/cups-defaults.m4 | 6 +- config-scripts/cups-directories.m4 | 4 +- config-scripts/cups-dnssd.m4 | 2 +- config-scripts/cups-gssapi.m4 | 2 +- config-scripts/cups-manpages.m4 | 4 +- config-scripts/cups-network.m4 | 2 +- config-scripts/cups-opsys.m4 | 2 +- config-scripts/cups-pam.m4 | 2 +- config-scripts/cups-startup.m4 | 4 +- config.h.in | 6 +- configure | 263 +++++++------ cups/adminutil.c | 4 +- cups/adminutil.h | 2 +- cups/api-filter.shtml | 10 +- cups/api-ppd.header | 2 +- cups/api-ppd.shtml | 2 +- cups/array.c | 46 +-- cups/auth.c | 2 +- cups/backchannel.c | 4 +- cups/backend.c | 4 +- cups/cups.h | 38 +- cups/dest-job.c | 10 +- cups/dest-localization.c | 6 +- cups/dest-options.c | 22 +- cups/dest.c | 26 +- cups/dir.c | 16 +- cups/encode.c | 2 +- cups/file.c | 54 +-- cups/getdevices.c | 2 +- cups/getputfile.c | 8 +- cups/http-addr.c | 18 +- cups/http-addrlist.c | 10 +- cups/http-private.h | 2 +- cups/http-support.c | 16 +- cups/http.c | 54 +-- cups/http.h | 36 +- cups/ipp-support.c | 14 +- cups/ipp.c | 114 +++--- cups/ipp.h | 46 +-- cups/notify.c | 4 +- cups/options.c | 2 +- cups/ppd-attr.c | 4 +- cups/ppd-conflicts.c | 6 +- cups/ppd-custom.c | 8 +- cups/ppd-emit.c | 8 +- cups/ppd-localize.c | 8 +- cups/ppd-mark.c | 8 +- cups/ppd-page.c | 2 +- cups/ppd-util.c | 6 +- cups/ppd.c | 12 +- cups/ppd.h | 56 +-- cups/pwg-media.c | 16 +- cups/raster.h | 62 ++-- cups/request.c | 12 +- cups/sidechannel.c | 10 +- cups/sidechannel.h | 6 +- cups/tempfile.c | 2 +- cups/tls-darwin.c | 14 +- cups/tls-gnutls.c | 2 +- cups/tls-sspi.c | 2 +- cups/usersys.c | 16 +- cups/util.c | 16 +- cups/versioning.h | 2 +- doc/de/index.html.in | 2 +- doc/es/index.html.in | 2 +- doc/help/api-admin.html | 10 +- doc/help/api-array.html | 46 +-- doc/help/api-cups.html | 140 +++---- doc/help/api-filedir.html | 64 ++-- doc/help/api-filter.html | 38 +- doc/help/api-httpipp.html | 298 +++++++-------- doc/help/api-overview.html | 2 +- doc/help/api-ppd.html | 86 ++--- doc/help/api-raster.html | 78 ++-- doc/help/kerberos.html | 2 +- doc/help/license.html | 2 +- doc/help/man-backend.html | 2 +- doc/help/man-client.conf.html | 10 +- doc/help/man-cups-files.conf.html | 8 +- doc/help/man-cupsd-helper.html | 2 +- doc/help/man-filter.html | 2 +- doc/help/man-mime.convs.html | 2 +- doc/help/man-ppdpo.html | 4 +- doc/help/network.html | 2 +- doc/help/overview.html | 2 +- doc/help/postscript-driver.html | 10 +- doc/help/ppd-compiler.html | 4 +- doc/help/raster-driver.html | 14 +- doc/help/ref-ppdcfile.html | 8 +- doc/help/security.html | 4 +- doc/help/sharing.html | 4 +- doc/help/spec-ipp.html | 74 ++-- doc/help/spec-postscript.html | 2 +- doc/help/spec-ppd.html | 122 +++--- doc/index.html.in | 2 +- doc/ja/index.html.in | 2 +- doc/pt_BR/index.html.in | 4 +- filter/api-raster.shtml | 6 +- filter/error.c | 2 +- filter/interpret.c | 4 +- filter/postscript-driver.header | 2 +- filter/postscript-driver.shtml | 4 +- filter/ppd-compiler.shtml | 2 +- filter/raster-driver.header | 2 +- filter/raster-driver.shtml | 8 +- filter/raster.c | 4 +- filter/spec-ppd.shtml | 116 +++--- locale/Makefile | 4 +- locale/cups.pot | 572 ++++++++++++++--------------- locale/cups.strings | 8 +- locale/cups_ca.po | 45 ++- locale/cups_cs.po | 28 +- locale/cups_de.po | 45 ++- locale/cups_es.po | 50 +-- locale/cups_fr.po | 28 +- locale/cups_it.po | 46 ++- locale/cups_ja.po | 45 ++- locale/cups_pt_BR.po | 45 ++- locale/cups_ru.po | 46 ++- man/backend.man | 2 +- man/client.conf.man.in | 12 +- man/cups-files.conf.man.in | 12 +- man/cupsd-helper.man | 2 +- man/filter.man | 2 +- man/mime.convs.man | 2 +- man/ppdpo.man | 4 +- packaging/InstallationCheck | 11 - packaging/LICENSE.rtf | 434 ---------------------- packaging/WELCOME.rtf | 24 -- packaging/cups-desc.plist.in | 14 - packaging/cups-info.plist.in | 26 -- packaging/cups.list.in | 2 +- packaging/cups.spec.in | 4 +- packaging/installer.gif | Bin 3392 -> 0 bytes packaging/installer.tif | Bin 5538 -> 0 bytes ppdc/ppdc-catalog.cxx | 2 +- ppdc/ppdc.cxx | 2 +- scheduler/auth.c | 2 +- scheduler/cert.c | 2 +- scheduler/client.c | 2 +- scheduler/conf.h | 2 +- scheduler/cups-driverd.cxx | 4 +- scheduler/cupsfilter.c | 2 +- scheduler/env.c | 2 +- scheduler/job.c | 2 +- scheduler/process.c | 2 +- scheduler/select.c | 2 +- scheduler/sysman.c | 4 +- scheduler/util.c | 4 +- test/ipptool.c | 2 +- vcnet/config.h | 4 +- xcode/config.h | 6 +- 157 files changed, 1721 insertions(+), 2220 deletions(-) delete mode 100755 packaging/InstallationCheck delete mode 100644 packaging/LICENSE.rtf delete mode 100644 packaging/WELCOME.rtf delete mode 100644 packaging/cups-desc.plist.in delete mode 100644 packaging/cups-info.plist.in delete mode 100644 packaging/installer.gif delete mode 100644 packaging/installer.tif diff --git a/CHANGES.txt b/CHANGES.txt index 0453362e3..ad68a78cb 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -38,7 +38,7 @@ CHANGES IN CUPS V2.2b1 - Added support for disc media sizes () - The httpAddrConnect and httpConnect* APIs now try connecting to multiple addresses in parallel () - - The cupsd domain socket is no longer world-accessible on OS X + - The cupsd domain socket is no longer world-accessible on macOS () - Interface scripts are no longer supported for security reasons () diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 32e36ae1f..c2426277a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -131,7 +131,7 @@ columns. > Note: > > The ".cxx" extension is used because it is the only common C++ extension -> between Linux, OS X, UNIX, and Windows. +> between Linux, macOS, UNIX, and Windows. The top of each source file contains a header giving the purpose or nature of the source file and the copyright and licensing notice: @@ -613,8 +613,8 @@ target rule is used to create the automatic dependencies: depend: TAB $(CC) -MM $(ALL_CFLAGS) $(OBJS:.o=.c) >Dependencies -We regenerate the automatic dependencies on an OS X system and express any -non-OS X dependencies statically in the makefile. +We regenerate the automatic dependencies on an macOS system and express any +non-macOS dependencies statically in the makefile. ### INSTALL/UNINSTALL SUPPORT diff --git a/INSTALL.txt b/INSTALL.txt index 60dc5776e..e1f378326 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -38,7 +38,7 @@ BEFORE YOU BEGIN Also, please note that CUPS does not include print filters to support PDF or raster printing. You *must* download GPL Ghostscript and/or the Open Printing CUPS filters package separately to print on operating systems - other than OS X. + other than macOS. COMPILING THE SUBVERSION REPOSITORY CODE @@ -98,7 +98,7 @@ CONFIGURATION and diagnose a variety of common problems - use the "--enable-unit-tests" configure option to run them at build time. - On OS X, use the "--with-archflags" option to build with the correct set of + On macOS, use the "--with-archflags" option to build with the correct set of architectures: ./configure --with-archflags="-arch i386 -arch x86_64" ... diff --git a/LICENSE.txt b/LICENSE.txt index 658ea1e46..51d42e2f1 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ CUPS License Agreement - Copyright 2007-2013 by Apple Inc. + Copyright 2007-2016 by Apple Inc. 1 Infinite Loop Cupertino, CA 95014 USA @@ -70,8 +70,8 @@ the following special exception: b. An Apple Operating System means any operating system software developed and/or marketed by Apple Inc., including but not limited to all existing releases and - versions of Apple's Darwin, OS X, and OS X Server - products and all follow-on releases and future + versions of Apple's Darwin, iOS, macOS, macOS Server, and + tvOS products and all follow-on releases and future versions thereof. c. This exception is only available for Apple diff --git a/Makefile b/Makefile index 1698bd44a..264dc1b4d 100644 --- a/Makefile +++ b/Makefile @@ -314,22 +314,15 @@ sloc: EPMFLAGS = -v --output-dir dist $(EPMARCH) -bsd deb pkg slackware: +bsd deb epm pkg rpm slackware: epm $(EPMFLAGS) -f $@ cups packaging/cups.list -epm: - epm $(EPMFLAGS) -s packaging/installer.gif cups packaging/cups.list - -rpm: - epm $(EPMFLAGS) -f rpm -s packaging/installer.gif cups packaging/cups.list - .PHONEY: dist dist: all $(RM) -r dist $(MAKE) $(MFLAGS) epm case `uname` in \ *BSD*) $(MAKE) $(MFLAGS) bsd;; \ - Darwin*) $(MAKE) $(MFLAGS) osx;; \ Linux*) test ! -x /usr/bin/rpm || $(MAKE) $(MFLAGS) rpm;; \ SunOS*) $(MAKE) $(MFLAGS) pkg;; \ esac diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4 index 7c2080a04..4471e3c7c 100644 --- a/config-scripts/cups-defaults.m4 +++ b/config-scripts/cups-defaults.m4 @@ -22,8 +22,8 @@ AC_ARG_WITH(languages, [ --with-languages set installed languages, defau esac]) AC_SUBST(LANGUAGES) -dnl OS X bundle-based localization support -AC_ARG_WITH(bundledir, [ --with-bundledir set OS X localization bundle directory ], +dnl macOS bundle-based localization support +AC_ARG_WITH(bundledir, [ --with-bundledir set macOS localization bundle directory ], CUPS_BUNDLEDIR="$withval", if test "x$uname" = xDarwin -a $uversion -ge 100; then CUPS_BUNDLEDIR="/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A" @@ -382,7 +382,7 @@ AC_SUBST(DEFAULT_IPP_PORT) AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IPP_PORT,$DEFAULT_IPP_PORT) dnl Web interface... -AC_ARG_ENABLE(webif, [ --enable-webif enable the web interface by default, default=no for OS X]) +AC_ARG_ENABLE(webif, [ --enable-webif enable the web interface by default, default=no for macOS]) case "x$enable_webif" in xno) CUPS_WEBIF=No diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4 index a9dc67b50..e13ee439a 100644 --- a/config-scripts/cups-directories.m4 +++ b/config-scripts/cups-directories.m4 @@ -267,7 +267,7 @@ AC_SUBST(CUPS_REQUESTS) # Server executables... case "$uname" in *BSD* | Darwin*) - # *BSD and Darwin (MacOS X) + # *BSD and Darwin (MacmacOS) INSTALL_SYSV="" CUPS_SERVERBIN="$exec_prefix/libexec/cups" ;; @@ -291,7 +291,7 @@ AC_SUBST(CUPS_SERVERROOT) AC_ARG_WITH(rundir, [ --with-rundir set transient run-time state directory],CUPS_STATEDIR="$withval",[ case "$uname" in Darwin*) - # Darwin (OS X) + # Darwin (macOS) CUPS_STATEDIR="$CUPS_SERVERROOT" ;; *) diff --git a/config-scripts/cups-dnssd.m4 b/config-scripts/cups-dnssd.m4 index 86a8de088..6af8baa20 100644 --- a/config-scripts/cups-dnssd.m4 +++ b/config-scripts/cups-dnssd.m4 @@ -43,7 +43,7 @@ if test "x$DNSSD_BACKEND" = x -a x$enable_dnssd != xno; then AC_CHECK_HEADER(dns_sd.h, [ case "$uname" in Darwin*) - # Darwin and MacOS X... + # Darwin and MacmacOS... AC_DEFINE(HAVE_DNSSD) DNSSDLIBS="-framework CoreFoundation -framework SystemConfiguration" DNSSD_BACKEND="dnssd" diff --git a/config-scripts/cups-gssapi.m4 b/config-scripts/cups-gssapi.m4 index 548898495..e540bfcce 100644 --- a/config-scripts/cups-gssapi.m4 +++ b/config-scripts/cups-gssapi.m4 @@ -24,7 +24,7 @@ if test x$enable_gssapi != xno; then if test "x$KRB5CONFIG" != x; then case "$uname" in Darwin) - # OS X weak-links to the Kerberos framework... + # macOS weak-links to the Kerberos framework... LIBGSSAPI="-weak_framework Kerberos" AC_MSG_CHECKING(for GSS framework) if test -d /System/Library/Frameworks/GSS.framework; then diff --git a/config-scripts/cups-manpages.m4 b/config-scripts/cups-manpages.m4 index 4224addef..a0c0c05fd 100644 --- a/config-scripts/cups-manpages.m4 +++ b/config-scripts/cups-manpages.m4 @@ -21,7 +21,7 @@ fi if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/"; then case "$uname" in Darwin* | Linux | GNU | *BSD*) - # Darwin, MacOS X, Linux, GNU HURD, and *BSD + # Darwin, MacmacOS, Linux, GNU HURD, and *BSD mandir="/usr/share/man" AMANDIR="/usr/share/man" PMANDIR="/usr/share/man" @@ -52,7 +52,7 @@ case "$uname" in MAN8DIR=1m ;; Linux* | GNU* | Darwin*) - # Linux, GNU Hurd, and OS X + # Linux, GNU Hurd, and macOS MAN1EXT=1.gz MAN5EXT=5.gz MAN7EXT=7.gz diff --git a/config-scripts/cups-network.m4 b/config-scripts/cups-network.m4 index 1c2604a73..dd2749d22 100644 --- a/config-scripts/cups-network.m4 +++ b/config-scripts/cups-network.m4 @@ -47,7 +47,7 @@ if test x$enable_domainsocket != xno -a x$default_domainsocket != xno; then if test "x$default_domainsocket" = x; then case "$uname" in Darwin*) - # Darwin and MaxOS X do their own thing... + # Darwin and MaxmacOS do their own thing... CUPS_DEFAULT_DOMAINSOCKET="$localstatedir/run/cupsd" ;; *) diff --git a/config-scripts/cups-opsys.m4 b/config-scripts/cups-opsys.m4 index 549b27a21..3cf6fb113 100644 --- a/config-scripts/cups-opsys.m4 +++ b/config-scripts/cups-opsys.m4 @@ -20,7 +20,7 @@ case "$uname" in Darwin*) uname="Darwin" if test $uversion -lt 120; then - AC_MSG_ERROR([Sorry, this version of CUPS requires OS X 10.8 or higher.]) + AC_MSG_ERROR([Sorry, this version of CUPS requires macOS 10.8 or higher.]) fi ;; diff --git a/config-scripts/cups-pam.m4 b/config-scripts/cups-pam.m4 index de9c476be..e3c6aa6e8 100644 --- a/config-scripts/cups-pam.m4 +++ b/config-scripts/cups-pam.m4 @@ -54,7 +54,7 @@ if test x$enable_pam != xno; then case "$uname" in Darwin*) - # Darwin/OS X + # Darwin/macOS if test "x$with_pam_module" != x; then PAMFILE="pam.$with_pam_module" elif test -f /usr/lib/pam/pam_opendirectory.so.2; then diff --git a/config-scripts/cups-startup.m4 b/config-scripts/cups-startup.m4 index bbd6b891d..4410a10ef 100644 --- a/config-scripts/cups-startup.m4 +++ b/config-scripts/cups-startup.m4 @@ -16,7 +16,7 @@ ONDEMANDLIBS="" AC_SUBST(ONDEMANDFLAGS) AC_SUBST(ONDEMANDLIBS) -dnl Launchd is used on OS X/Darwin... +dnl Launchd is used on macOS/Darwin... AC_ARG_ENABLE(launchd, [ --disable-launchd disable launchd support]) LAUNCHD_DIR="" AC_SUBST(LAUNCHD_DIR) @@ -32,7 +32,7 @@ if test x$enable_launchd != xno; then case "$uname" in Darwin*) - # Darwin, MacOS X + # Darwin, MacmacOS LAUNCHD_DIR="/System/Library/LaunchDaemons" # liblaunch is already part of libSystem ;; diff --git a/config.h.in b/config.h.in index 37cfc4cd1..fea79cbb3 100644 --- a/config.h.in +++ b/config.h.in @@ -537,10 +537,10 @@ */ #undef HAVE_GETGROUPLIST - + /* - * Do we have OS X 10.4's mbr_XXX functions? + * Do we have macOS 10.4's mbr_XXX functions? */ #undef HAVE_MEMBERSHIP_H @@ -686,7 +686,7 @@ /* - * Location of OS X localization bundle, if any. + * Location of macOS localization bundle, if any. */ #undef CUPS_BUNDLEDIR diff --git a/configure b/configure index 3cade6c30..43858e65b 100755 --- a/configure +++ b/configure @@ -1,11 +1,13 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for CUPS 2.2b1. +# Generated by GNU Autoconf 2.68 for CUPS 2.2b1. # # Report bugs to . # # -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -134,31 +136,6 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# Use a proper internal environment variable to ensure we don't fall - # into an infinite loop, continuously re-executing ourselves. - if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then - _as_can_reexec=no; export _as_can_reexec; - # We cannot yet assume a decent shell, so we have to provide a -# neutralization value for shells without unset; and this also -# works around shells that cannot unset nonexistent variables. -# Preserve -v and -x to the replacement shell. -BASH_ENV=/dev/null -ENV=/dev/null -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; -esac -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -# Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -as_fn_exit 255 - fi - # We don't want this to propagate to other subprocesses. - { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -192,8 +169,7 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1 -test -x / || exit 1" +test x\$exitcode = x0 || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -238,25 +214,21 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - export CONFIG_SHELL - # We cannot yet assume a decent shell, so we have to provide a -# neutralization value for shells without unset; and this also -# works around shells that cannot unset nonexistent variables. -# Preserve -v and -x to the replacement shell. -BASH_ENV=/dev/null -ENV=/dev/null -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; -esac -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -# Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -exit 255 + # We cannot yet assume a decent shell, so we have to provide a + # neutralization value for shells without unset; and this also + # works around shells that cannot unset nonexistent variables. + # Preserve -v and -x to the replacement shell. + BASH_ENV=/dev/null + ENV=/dev/null + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL + case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; + esac + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} fi if test x$as_have_required = xno; then : @@ -359,14 +331,6 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p - -# as_fn_executable_p FILE -# ----------------------- -# Test if FILE is an executable regular file. -as_fn_executable_p () -{ - test -f "$1" && test -x "$1" -} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -488,10 +452,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - # If we had to re-execute with $CONFIG_SHELL, we're ensured to have - # already done that, so ensure we don't try to do so again and fall - # in an infinite loop. This has already happened in practice. - _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -526,16 +486,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. + # In both cases, we have to default to `cp -p'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' + as_ln_s='cp -p' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -547,8 +507,28 @@ else as_mkdir_p=false fi -as_test_x='test -x' -as_executable_p=as_fn_executable_p +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in #( + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -1380,6 +1360,8 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1565,7 +1547,7 @@ Optional Features: --disable-default-shared disable DefaultShared by default --disable-raw-printing do not allow raw printing by default - --enable-webif enable the web interface by default, default=no for OS X + --enable-webif enable the web interface by default, default=no for macOS Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1603,7 +1585,7 @@ Optional Packages: --with-rcstop set stop number for rc scripts --with-xinetd set path for xinetd config files --with-languages set installed languages, default=all - --with-bundledir set OS X localization bundle directory + --with-bundledir set macOS localization bundle directory --with-config-file-perm set default ConfigFilePerm value, default=0640 --with-cupsd-file-perm set default cupsd permissions, default=0500 --with-log-file-perm set default LogFilePerm value, default=0644 @@ -1706,9 +1688,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF CUPS configure 2.2b1 -generated by GNU Autoconf 2.69 +generated by GNU Autoconf 2.68 -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1859,7 +1841,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - test -x conftest$ac_exeext + $as_test_x conftest$ac_exeext }; then : ac_retval=0 else @@ -2170,7 +2152,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by CUPS $as_me 2.2b1, which was -generated by GNU Autoconf 2.69. Invocation command line was +generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2527,7 +2509,7 @@ case "$uname" in Darwin*) uname="Darwin" if test $uversion -lt 120; then - as_fn_error $? "Sorry, this version of CUPS requires OS X 10.8 or higher." "$LINENO" 5 + as_fn_error $? "Sorry, this version of CUPS requires macOS 10.8 or higher." "$LINENO" 5 fi ;; @@ -2589,7 +2571,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2637,7 +2619,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2681,7 +2663,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3125,7 +3107,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -struct stat; +#include +#include /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3375,7 +3358,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3419,7 +3402,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3621,7 +3604,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3661,7 +3644,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3714,7 +3697,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3754,7 +3737,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_CHMOD="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3794,7 +3777,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GZIP="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3834,7 +3817,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_LD="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3874,7 +3857,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_LN="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3914,7 +3897,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3954,7 +3937,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3994,7 +3977,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_RMDIR="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4034,7 +4017,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4074,7 +4057,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_XDGOPEN="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4150,7 +4133,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4193,7 +4176,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4603,7 +4586,7 @@ do for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_GREP" || continue + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4669,7 +4652,7 @@ do for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_EGREP" || continue + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -6294,7 +6277,7 @@ _ACEOF # Server executables... case "$uname" in *BSD* | Darwin*) - # *BSD and Darwin (MacOS X) + # *BSD and Darwin (MacmacOS) INSTALL_SYSV="" CUPS_SERVERBIN="$exec_prefix/libexec/cups" ;; @@ -6329,7 +6312,7 @@ else case "$uname" in Darwin*) - # Darwin (OS X) + # Darwin (macOS) CUPS_STATEDIR="$CUPS_SERVERROOT" ;; *) @@ -6355,7 +6338,7 @@ fi if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/"; then case "$uname" in Darwin* | Linux | GNU | *BSD*) - # Darwin, MacOS X, Linux, GNU HURD, and *BSD + # Darwin, MacmacOS, Linux, GNU HURD, and *BSD mandir="/usr/share/man" AMANDIR="/usr/share/man" PMANDIR="/usr/share/man" @@ -6385,7 +6368,7 @@ case "$uname" in MAN8DIR=1m ;; Linux* | GNU* | Darwin*) - # Linux, GNU Hurd, and OS X + # Linux, GNU Hurd, and macOS MAN1EXT=1.gz MAN5EXT=5.gz MAN7EXT=7.gz @@ -7563,7 +7546,7 @@ if test x$enable_domainsocket != xno -a x$default_domainsocket != xno; then if test "x$default_domainsocket" = x; then case "$uname" in Darwin*) - # Darwin and MaxOS X do their own thing... + # Darwin and MaxmacOS do their own thing... CUPS_DEFAULT_DOMAINSOCKET="$localstatedir/run/cupsd" ;; *) @@ -7638,7 +7621,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_KRB5CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7681,7 +7664,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_KRB5CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7720,7 +7703,7 @@ fi if test "x$KRB5CONFIG" != x; then case "$uname" in Darwin) - # OS X weak-links to the Kerberos framework... + # macOS weak-links to the Kerberos framework... LIBGSSAPI="-weak_framework Kerberos" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSS framework" >&5 $as_echo_n "checking for GSS framework... " >&6; } @@ -8233,7 +8216,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_LIBGNUTLSCONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8276,7 +8259,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_LIBGNUTLSCONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8331,7 +8314,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_LIBGCRYPTCONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8374,7 +8357,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_LIBGCRYPTCONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8700,7 +8683,7 @@ fi case "$uname" in Darwin*) - # Darwin/OS X + # Darwin/macOS if test "x$with_pam_module" != x; then PAMFILE="pam.$with_pam_module" elif test -f /usr/lib/pam/pam_opendirectory.so.2; then @@ -8933,8 +8916,6 @@ _ACEOF esac rm -rf conftest* fi - - fi @@ -9050,7 +9031,7 @@ if test "x$ac_cv_header_dns_sd_h" = xyes; then : case "$uname" in Darwin*) - # Darwin and MacOS X... + # Darwin and MacmacOS... $as_echo "#define HAVE_DNSSD 1" >>confdefs.h DNSSDLIBS="-framework CoreFoundation -framework SystemConfiguration" @@ -9149,7 +9130,7 @@ fi case "$uname" in Darwin*) - # Darwin, MacOS X + # Darwin, MacmacOS LAUNCHD_DIR="/System/Library/LaunchDaemons" # liblaunch is already part of libSystem ;; @@ -9949,7 +9930,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_JAVA="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10012,7 +9993,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10075,7 +10056,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PHPCGI="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10116,7 +10097,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PHP="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10184,7 +10165,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10652,16 +10633,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. + # In both cases, we have to default to `cp -p'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' + as_ln_s='cp -p' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -10721,16 +10702,28 @@ else as_mkdir_p=false fi - -# as_fn_executable_p FILE -# ----------------------- -# Test if FILE is an executable regular file. -as_fn_executable_p () -{ - test -f "$1" && test -x "$1" -} # as_fn_executable_p -as_test_x='test -x' -as_executable_p=as_fn_executable_p +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in #( + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -10752,7 +10745,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by CUPS $as_me 2.2b1, which was -generated by GNU Autoconf 2.69. Invocation command line was +generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -10815,10 +10808,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ CUPS config.status 2.2b1 -configured by $0, generated by GNU Autoconf 2.69, +configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -10907,7 +10900,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' diff --git a/cups/adminutil.c b/cups/adminutil.c index ec660d8cc..6a3caeb81 100644 --- a/cups/adminutil.c +++ b/cups/adminutil.c @@ -831,7 +831,7 @@ cupsAdminExportSamba( * The returned settings should be freed with cupsFreeOptions() when * you are done with them. * - * @since CUPS 1.3/OS X 10.5@ + * @since CUPS 1.3/macOS 10.5@ */ int /* O - 1 on success, 0 on failure */ @@ -1147,7 +1147,7 @@ cupsAdminGetServerSettings( /* * 'cupsAdminSetServerSettings()' - Set settings on the server. * - * @since CUPS 1.3/OS X 10.5@ + * @since CUPS 1.3/macOS 10.5@ */ int /* O - 1 on success, 0 on failure */ diff --git a/cups/adminutil.h b/cups/adminutil.h index ea9d6a0e0..cc119fc5b 100644 --- a/cups/adminutil.h +++ b/cups/adminutil.h @@ -54,7 +54,7 @@ typedef void (*cups_device_cb_t)(const char *device_class, const char *device_uri, const char *device_location, void *user_data); /* Device callback - * @since CUPS 1.4/OS X 10.6@ */ + * @since CUPS 1.4/macOS 10.6@ */ /* diff --git a/cups/api-filter.shtml b/cups/api-filter.shtml index ed2460408..1b8f6f3cf 100644 --- a/cups/api-filter.shtml +++ b/cups/api-filter.shtml @@ -79,7 +79,7 @@ directory to write to.

In addition, some operating systems provide additional security mechanisms that further limit file system access, even for backends running as root. On -OS X, for example, no backend may write to a user's home directory. See the Sandboxing on OS X section for more information.

+macOS, for example, no backend may write to a user's home directory. See the Sandboxing on macOS section for more information.

Canceled Jobs and Signal Handling

@@ -151,7 +151,7 @@ when running print filters and backends:

APPLE_LANGUAGE
The Apple language identifier associated with the job - (OS X only).
+ (macOS only).
CHARSET
The job character set, typically "utf-8".
@@ -561,7 +561,7 @@ sub-state and not an issue that applies when a job is not printing.

Note:

"STATE:" messages often provide visible alerts to the user. For example, -on OS X setting a printer-state-reason value with an "-error" or +on macOS setting a printer-state-reason value with an "-error" or "-warning" suffix will cause the printer's dock item to bounce if the corresponding reason is localized with a cupsIPPReason keyword in the printer's PPD file.

@@ -851,9 +851,9 @@ void *my_data; cupsSNMPSideChannelWalk(".1.3.6.1.2.1.43", 5.0, my_callback, my_data); -

Sandboxing on OS X

+

Sandboxing on macOS

-

Starting with OS X 10.6, filters and backends are run inside a security "sandbox" which further limits (beyond the normal UNIX user/group permissions) what a filter or backend can do. This helps to both secure the printing system from malicious software and enforce the functional separation of components in the CUPS filter chain. What follows is a list of actions that are explicitly allowed for all filters and backends:

+

Starting with macOS 10.6, filters and backends are run inside a security "sandbox" which further limits (beyond the normal UNIX user/group permissions) what a filter or backend can do. This helps to both secure the printing system from malicious software and enforce the functional separation of components in the CUPS filter chain. What follows is a list of actions that are explicitly allowed for all filters and backends:

    diff --git a/cups/api-ppd.header b/cups/api-ppd.header index 6c0551f5f..2f7a4cdc3 100644 --- a/cups/api-ppd.header +++ b/cups/api-ppd.header @@ -12,7 +12,7 @@

    PPD API (DEPRECATED)

    -
    The PPD API is deprecated starting in CUPS 1.6/OS X 10.8. Please use the new Job Ticket APIs in the CUPS API documentation. These functions will be removed in a future release of CUPS.
    +
    The PPD API is deprecated starting in CUPS 1.6/macOS 10.8. Please use the new Job Ticket APIs in the CUPS API documentation. These functions will be removed in a future release of CUPS.
    diff --git a/cups/api-ppd.shtml b/cups/api-ppd.shtml index 381035380..50c485005 100644 --- a/cups/api-ppd.shtml +++ b/cups/api-ppd.shtml @@ -13,7 +13,7 @@

    Overview

    -
    The PPD API is deprecated starting in CUPS 1.6/OS X 10.8. Please use the new Job Ticket APIs in the CUPS API documentation. These functions will be removed in a future release of CUPS.
    +
    The PPD API is deprecated starting in CUPS 1.6/macOS 10.8. Please use the new Job Ticket APIs in the CUPS API documentation. These functions will be removed in a future release of CUPS.

    The CUPS PPD API provides read-only access the data in PostScript Printer Description ("PPD") files which are used for all printers with a driver. With diff --git a/cups/array.c b/cups/array.c index fa54cc8d3..b8bec274d 100644 --- a/cups/array.c +++ b/cups/array.c @@ -77,7 +77,7 @@ static int cups_array_find(cups_array_t *a, void *e, int prev, int *rdiff); * appended at the end of the run of identical elements. For unsorted arrays, * the element is appended to the end of the array. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 1 on success, 0 on failure */ @@ -207,7 +207,7 @@ _cupsArrayAddStrings(cups_array_t *a, /* I - Array */ * The caller is responsible for freeing the memory used by the * elements themselves. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void @@ -249,7 +249,7 @@ cupsArrayClear(cups_array_t *a) /* I - Array */ /* * 'cupsArrayCount()' - Get the number of elements in the array. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - Number of elements */ @@ -276,7 +276,7 @@ cupsArrayCount(cups_array_t *a) /* I - Array */ * The current element is undefined until you call @link cupsArrayFind@, * @link cupsArrayFirst@, or @link cupsArrayIndex@, or @link cupsArrayLast@. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void * /* O - Element */ @@ -306,7 +306,7 @@ cupsArrayCurrent(cups_array_t *a) /* I - Array */ * The caller is responsible for freeing the memory used by the * elements themselves. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void @@ -350,7 +350,7 @@ cupsArrayDelete(cups_array_t *a) /* I - Array */ /* * 'cupsArrayDup()' - Duplicate the array. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ cups_array_t * /* O - Duplicate array */ @@ -435,7 +435,7 @@ cupsArrayDup(cups_array_t *a) /* I - Array */ /* * 'cupsArrayFind()' - Find an element in the array. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void * /* O - Element found or @code NULL@ */ @@ -530,7 +530,7 @@ cupsArrayFind(cups_array_t *a, /* I - Array */ /* * 'cupsArrayFirst()' - Get the first element in the array. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void * /* O - First element or @code NULL@ if the array is empty */ @@ -559,7 +559,7 @@ cupsArrayFirst(cups_array_t *a) /* I - Array */ * The current element is undefined until you call @link cupsArrayFind@, * @link cupsArrayFirst@, or @link cupsArrayIndex@, or @link cupsArrayLast@. * - * @since CUPS 1.3/OS X 10.5@ + * @since CUPS 1.3/macOS 10.5@ */ int /* O - Index of the current element, starting at 0 */ @@ -575,7 +575,7 @@ cupsArrayGetIndex(cups_array_t *a) /* I - Array */ /* * 'cupsArrayGetInsert()' - Get the index of the last inserted element. * - * @since CUPS 1.3/OS X 10.5@ + * @since CUPS 1.3/macOS 10.5@ */ int /* O - Index of the last inserted element, starting at 0 */ @@ -591,7 +591,7 @@ cupsArrayGetInsert(cups_array_t *a) /* I - Array */ /* * 'cupsArrayIndex()' - Get the N-th element in the array. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void * /* O - N-th element or @code NULL@ */ @@ -614,7 +614,7 @@ cupsArrayIndex(cups_array_t *a, /* I - Array */ * inserted at the beginning of the run of identical elements. For unsorted * arrays, the element is inserted at the beginning of the array. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 0 on failure, 1 on success */ @@ -644,7 +644,7 @@ cupsArrayInsert(cups_array_t *a, /* I - Array */ /* * 'cupsArrayLast()' - Get the last element in the array. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void * /* O - Last element or @code NULL@ if the array is empty */ @@ -675,7 +675,7 @@ cupsArrayLast(cups_array_t *a) /* I - Array */ * data pointer argument can safely be omitted when not required so functions * like @code strcmp@ can be used for sorted string arrays. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ cups_array_t * /* O - Array */ @@ -697,7 +697,7 @@ cupsArrayNew(cups_array_func_t f, /* I - Comparison function or @code NULL@ for * The hash function ("h") is used to implement cached lookups with the * specified hash size ("hsize"). * - * @since CUPS 1.3/OS X 10.5@ + * @since CUPS 1.3/macOS 10.5@ */ cups_array_t * /* O - Array */ @@ -727,7 +727,7 @@ cupsArrayNew2(cups_array_func_t f, /* I - Comparison function or @code NULL@ fo * The free function ("cf") is used to automatically free/release elements when * removed or the array is deleted. * - * @since CUPS 1.5/OS X 10.7@ + * @since CUPS 1.5/macOS 10.7@ */ cups_array_t * /* O - Array */ @@ -811,7 +811,7 @@ _cupsArrayNewStrings(const char *s, /* I - Delimited strings or NULL */ * @link cupsArrayFirst@, or @link cupsArrayIndex@, or @link cupsArrayLast@ * to set the current element. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void * /* O - Next element or @code NULL@ */ @@ -844,7 +844,7 @@ cupsArrayNext(cups_array_t *a) /* I - Array */ * @link cupsArrayFirst@, or @link cupsArrayIndex@, or @link cupsArrayLast@ * to set the current element. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void * /* O - Previous element or @code NULL@ */ @@ -877,7 +877,7 @@ cupsArrayPrev(cups_array_t *a) /* I - Array */ * The caller is responsible for freeing the memory used by the * removed element. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 1 on success, 0 on failure */ @@ -942,7 +942,7 @@ cupsArrayRemove(cups_array_t *a, /* I - Array */ /* * 'cupsArrayRestore()' - Reset the current element to the last @link cupsArraySave@. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void * /* O - New current element */ @@ -973,7 +973,7 @@ cupsArrayRestore(cups_array_t *a) /* I - Array */ * * The save/restore stack is guaranteed to be at least 32 elements deep. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 1 on success, 0 on failure */ @@ -995,7 +995,7 @@ cupsArraySave(cups_array_t *a) /* I - Array */ /* * 'cupsArrayUserData()' - Return the user data for an array. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void * /* O - User data */ @@ -1011,7 +1011,7 @@ cupsArrayUserData(cups_array_t *a) /* I - Array */ /* * 'cups_array_add()' - Insert or append an element to the array. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ static int /* O - 1 on success, 0 on failure */ diff --git a/cups/auth.c b/cups/auth.c index f9e9f98ba..f9187ffa8 100644 --- a/cups/auth.c +++ b/cups/auth.c @@ -102,7 +102,7 @@ static int cups_local_auth(http_t *http); * This function should be called in response to a @code HTTP_STATUS_UNAUTHORIZED@ * status, prior to resubmitting your request. * - * @since CUPS 1.1.20/OS X 10.4@ + * @since CUPS 1.1.20/macOS 10.4@ */ int /* O - 0 on success, -1 on error */ diff --git a/cups/backchannel.c b/cups/backchannel.c index c4c96acbe..13a956027 100644 --- a/cups/backchannel.c +++ b/cups/backchannel.c @@ -42,7 +42,7 @@ static void cups_setup(fd_set *set, struct timeval *tval, * parameter controls how many seconds to wait for the data - use 0.0 to * return immediately if there is no data, -1.0 to wait for data indefinitely. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ssize_t /* O - Bytes read or -1 on error */ @@ -93,7 +93,7 @@ cupsBackChannelRead(char *buffer, /* I - Buffer to read into */ * 0.0 to return immediately if the data cannot be written, -1.0 to wait * indefinitely. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ssize_t /* O - Bytes written or -1 on error */ diff --git a/cups/backend.c b/cups/backend.c index b84ea5ca3..a21ee387a 100644 --- a/cups/backend.c +++ b/cups/backend.c @@ -37,7 +37,7 @@ static void quote_string(const char *s); * variable or the device URI passed in argv[0], whichever is found * first. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ const char * /* O - Device URI or @code NULL@ */ @@ -85,7 +85,7 @@ cupsBackendDeviceURI(char **argv) /* I - Command-line arguments */ * It handles quoting of special characters in the device-make-and-model, * device-info, device-id, and device-location strings. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ void diff --git a/cups/cups.h b/cups/cups.h index 5a197fcb2..f45116606 100644 --- a/cups/cups.h +++ b/cups/cups.h @@ -225,20 +225,20 @@ enum cups_ptype_e /* Printer type/capability bit CUPS_PRINTER_FAX = 0x40000, /* Fax queue */ CUPS_PRINTER_REJECTING = 0x80000, /* Printer is rejecting jobs */ CUPS_PRINTER_DELETE = 0x100000, /* Delete printer - * @since CUPS 1.2/OS X 10.5@ */ + * @since CUPS 1.2/macOS 10.5@ */ CUPS_PRINTER_NOT_SHARED = 0x200000, /* Printer is not shared - * @since CUPS 1.2/OS X 10.5@ */ + * @since CUPS 1.2/macOS 10.5@ */ CUPS_PRINTER_AUTHENTICATED = 0x400000,/* Printer requires authentication - * @since CUPS 1.2/OS X 10.5@ */ + * @since CUPS 1.2/macOS 10.5@ */ CUPS_PRINTER_COMMANDS = 0x800000, /* Printer supports maintenance commands - * @since CUPS 1.2/OS X 10.5@ */ + * @since CUPS 1.2/macOS 10.5@ */ CUPS_PRINTER_DISCOVERED = 0x1000000, /* Printer was automatically discovered * and added @private@ * @since Deprecated@ */ CUPS_PRINTER_SCANNER = 0x2000000, /* Scanner-only device - * @since CUPS 1.4/OS X 10.6@ */ + * @since CUPS 1.4/macOS 10.6@ */ CUPS_PRINTER_MFP = 0x4000000, /* Printer with scanning capabilities - * @since CUPS 1.4/OS X 10.6@ */ + * @since CUPS 1.4/macOS 10.6@ */ CUPS_PRINTER_3D = 0x8000000, /* Printer with 3D capabilities @since CUPS 2.1@ */ CUPS_PRINTER_OPTIONS = 0x6fffc /* ~(CLASS | REMOTE | IMPLICIT | * DEFAULT | FAX | REJECTING | DELETE | @@ -263,7 +263,7 @@ typedef struct cups_dest_s /**** Destination ****/ typedef struct _cups_dinfo_s cups_dinfo_t; /* Destination capability and status - * information @since CUPS 1.6/OS X 10.8@ */ + * information @since CUPS 1.6/macOS 10.8@ */ typedef struct cups_job_s /**** Job ****/ { @@ -280,7 +280,7 @@ typedef struct cups_job_s /**** Job ****/ time_t processing_time; /* Time the job was processed */ } cups_job_t; -typedef struct cups_size_s /**** Media Size @since CUPS 1.6/OS X 10.8@ ****/ +typedef struct cups_size_s /**** Media Size @since CUPS 1.6/macOS 10.8@ ****/ { char media[128]; /* Media name to use */ int width, /* Width in hundredths of millimeters */ @@ -300,17 +300,17 @@ typedef int (*cups_client_cert_cb_t)(http_t *http, void *tls, cups_array_t *distinguished_names, void *user_data); /* Client credentials callback - * @since CUPS 1.5/OS X 10.7@ */ + * @since CUPS 1.5/macOS 10.7@ */ typedef int (*cups_dest_cb_t)(void *user_data, unsigned flags, cups_dest_t *dest); /* Destination enumeration callback - * @since CUPS 1.6/OS X 10.8@ */ + * @since CUPS 1.6/macOS 10.8@ */ # ifdef __BLOCKS__ typedef int (^cups_dest_block_t)(unsigned flags, cups_dest_t *dest); /* Destination enumeration block - * @since CUPS 1.6/OS X 10.8@ */ + * @since CUPS 1.6/macOS 10.8@ */ # endif /* __BLOCKS__ */ typedef const char *(*cups_password_cb_t)(const char *prompt); @@ -321,12 +321,12 @@ typedef const char *(*cups_password_cb2_t)(const char *prompt, http_t *http, const char *resource, void *user_data); /* New password callback - * @since CUPS 1.4/OS X 10.6@ */ + * @since CUPS 1.4/macOS 10.6@ */ typedef int (*cups_server_cert_cb_t)(http_t *http, void *tls, cups_array_t *certs, void *user_data); /* Server credentials callback - * @since CUPS 1.5/OS X 10.7@ */ + * @since CUPS 1.5/macOS 10.7@ */ /* @@ -414,7 +414,7 @@ extern int cupsPrintFiles2(http_t *http, const char *name, extern int cupsSetDests2(http_t *http, int num_dests, cups_dest_t *dests) _CUPS_API_1_1_21; -/**** New in CUPS 1.2/OS X 10.5 ****/ +/**** New in CUPS 1.2/macOS 10.5 ****/ extern ssize_t cupsBackChannelRead(char *buffer, size_t bytes, double timeout) _CUPS_API_1_2; extern ssize_t cupsBackChannelWrite(const char *buffer, size_t bytes, @@ -431,7 +431,7 @@ extern int cupsRemoveOption(const char *name, int num_options, cups_option_t **options) _CUPS_API_1_2; extern cups_file_t *cupsTempFile2(char *filename, int len) _CUPS_API_1_2; -/**** New in CUPS 1.3/OS X 10.5 ****/ +/**** New in CUPS 1.3/macOS 10.5 ****/ extern ipp_t *cupsDoIORequest(http_t *http, ipp_t *request, const char *resource, int infile, int outfile) _CUPS_API_1_3; @@ -444,7 +444,7 @@ extern void cupsSetDefaultDest(const char *name, int num_dests, cups_dest_t *dests) _CUPS_API_1_3; -/**** New in CUPS 1.4/OS X 10.6 ****/ +/**** New in CUPS 1.4/macOS 10.6 ****/ extern ipp_status_t cupsCancelJob2(http_t *http, const char *name, int job_id, int purge) _CUPS_API_1_4; extern int cupsCreateJob(http_t *http, const char *name, @@ -473,14 +473,14 @@ extern http_status_t cupsStartDocument(http_t *http, const char *name, extern http_status_t cupsWriteRequestData(http_t *http, const char *buffer, size_t length) _CUPS_API_1_4; -/**** New in CUPS 1.5/OS X 10.7 ****/ +/**** New in CUPS 1.5/macOS 10.7 ****/ extern void cupsSetClientCertCB(cups_client_cert_cb_t cb, void *user_data) _CUPS_API_1_5; extern int cupsSetCredentials(cups_array_t *certs) _CUPS_API_1_5; extern void cupsSetServerCertCB(cups_server_cert_cb_t cb, void *user_data) _CUPS_API_1_5; -/**** New in CUPS 1.6/OS X 10.8 ****/ +/**** New in CUPS 1.6/macOS 10.8 ****/ extern ipp_status_t cupsCancelDestJob(http_t *http, cups_dest_t *dest, int job_id) _CUPS_API_1_6; extern int cupsCheckDestSupported(http_t *http, cups_dest_t *dest, @@ -592,7 +592,7 @@ extern int cupsGetDestMediaDefault(http_t *http, cups_dest_t *dest, extern void cupsSetUserAgent(const char *user_agent) _CUPS_API_1_7; extern const char *cupsUserAgent(void) _CUPS_API_1_7; -/* New in CUPS 2.0/OS X 10.10 */ +/* New in CUPS 2.0/macOS 10.10 */ extern cups_dest_t *cupsGetDestWithURI(const char *name, const char *uri) _CUPS_API_2_0; extern const char *cupsLocalizeDestMedia(http_t *http, cups_dest_t *dest, cups_dinfo_t *info, unsigned flags, cups_size_t *size) _CUPS_API_2_0; extern int cupsMakeServerCredentials(const char *path, const char *common_name, int num_alt_names, const char **alt_names, time_t expiration_date) _CUPS_API_2_0; diff --git a/cups/dest-job.c b/cups/dest-job.c index 6b7a9e2c1..146887eea 100644 --- a/cups/dest-job.c +++ b/cups/dest-job.c @@ -28,7 +28,7 @@ * @code IPP_STATUS_ERRPR_NOT_AUTHORIZED@ or * @code IPP_STATUS_ERROR_FORBIDDEN@ on failure. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ ipp_status_t @@ -66,7 +66,7 @@ cupsCancelDestJob(http_t *http, /* I - Connection to destination */ * "job_id" is the job ID returned by cupsCreateDestJob. Returns @code IPP_STATUS_OK@ * on success. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ ipp_status_t /* O - IPP status code */ @@ -150,7 +150,7 @@ cupsCloseDestJob( * Returns @code IPP_STATUS_OK@ or @code IPP_STATUS_OK_SUBST@ on success, saving the job ID * in the variable pointed to by "job_id". * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ ipp_status_t /* O - IPP status code */ @@ -240,7 +240,7 @@ cupsCreateDestJob( * * Returns @code IPP_STATUS_OK@ or @code IPP_STATUS_OK_SUBST@ on success. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ ipp_status_t /* O - Status of document submission */ @@ -285,7 +285,7 @@ cupsFinishDestDocument( * if this is the last document to be submitted in the job. Returns * @code HTTP_CONTINUE@ on success. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ http_status_t /* O - Status of document creation */ diff --git a/cups/dest-localization.c b/cups/dest-localization.c index 195869e60..6358b6dbb 100644 --- a/cups/dest-localization.c +++ b/cups/dest-localization.c @@ -36,7 +36,7 @@ static char *cups_scan_strings(char *buffer); * The returned string is stored in the destination information and will become * invalid if the destination information is deleted. * - * @since CUPS 2.0/OS X 10.10@ + * @since CUPS 2.0/macOS 10.10@ */ const char * /* O - Localized string */ @@ -200,7 +200,7 @@ cupsLocalizeDestMedia( * The returned string is stored in the destination information and will become * invalid if the destination information is deleted. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ const char * /* O - Localized string */ @@ -239,7 +239,7 @@ cupsLocalizeDestOption( * The returned string is stored in the destination information and will become * invalid if the destination information is deleted. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ const char * /* O - Localized string */ diff --git a/cups/dest-options.c b/cups/dest-options.c index 438e6f681..fc3fd3573 100644 --- a/cups/dest-options.c +++ b/cups/dest-options.c @@ -64,7 +64,7 @@ static void cups_update_ready(http_t *http, cups_dinfo_t *dinfo); * * Returns 1 if supported, 0 otherwise. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 if supported, 0 otherwise */ @@ -261,7 +261,7 @@ cupsCheckDestSupported( * If cupsCopyDestConflicts returns 1 but "num_resolved" and "resolved" are set * to 0 and @code NULL@, respectively, then the conflict cannot be resolved. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 if there is a conflict, 0 if none, -1 on error */ @@ -546,7 +546,7 @@ cupsCopyDestConflicts( * The caller is responsible for calling @link cupsFreeDestInfo@ on the return * value. @code NULL@ is returned on error. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ cups_dinfo_t * /* O - Destination information */ @@ -672,7 +672,7 @@ cupsCopyDestInfo( * @code ippGetResolution@, @code ippGetString@, and @code ippGetValueTag@ * functions to inspect the default value(s) as needed. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ ipp_attribute_t * /* O - Default attribute or @code NULL@ for none */ @@ -713,7 +713,7 @@ cupsFindDestDefault( * @code ippGetResolution@, @code ippGetString@, and @code ippGetValueTag@ * functions to inspect the default value(s) as needed. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ ipp_attribute_t * /* O - Default attribute or @code NULL@ for none */ @@ -756,7 +756,7 @@ cupsFindDestReady( * @code ippGetResolution@, @code ippGetString@, and @code ippGetValueTag@ * functions to inspect the default value(s) as needed. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ ipp_attribute_t * /* O - Default attribute or @code NULL@ for none */ @@ -835,7 +835,7 @@ cupsFreeDestInfo(cups_dinfo_t *dinfo) /* I - Destination information */ * example, passing @code CUPS_MEDIA_FLAGS_BORDERLESS@ will get the Nth * borderless size supported by the printer. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ int /* O - 1 on success, 0 on failure */ @@ -924,7 +924,7 @@ cupsGetDestMediaByIndex( * * Returns 1 when there is a match and 0 if there is not a match. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on match, 0 on failure */ @@ -989,7 +989,7 @@ cupsGetDestMediaByName( * * Returns 1 when there is a match and 0 if there is not a match. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on match, 0 on failure */ @@ -1048,7 +1048,7 @@ cupsGetDestMediaBySize( * counted. For example, passing @code CUPS_MEDIA_FLAGS_BORDERLESS@ will return * the number of borderless sizes. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ int /* O - Number of sizes */ @@ -1089,7 +1089,7 @@ cupsGetDestMediaCount( * example, passing @code CUPS_MEDIA_FLAGS_BORDERLESS@ will return the default * borderless size, typically US Letter or A4, but sometimes 4x6 photo media. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ int /* O - 1 on success, 0 on failure */ diff --git a/cups/dest.c b/cups/dest.c index 1e3060338..018d03ade 100644 --- a/cups/dest.c +++ b/cups/dest.c @@ -557,7 +557,7 @@ _cupsAppleSetUseLastPrinter( * to by "cancel" is non-zero, or the callback function (or block) returns 0, * The caller is responsible for calling httpClose() on the returned object. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ http_t * /* O - Connection to server or @code NULL@ */ @@ -733,7 +733,7 @@ cupsConnectDest( * to by "cancel" is non-zero, or the callback function (or block) returns 0, * The caller is responsible for calling httpClose() on the returned object. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ http_t * /* O - Connection to server or @code NULL@ */ @@ -759,7 +759,7 @@ cupsConnectDestBlock( * copy) - for use with the cupsEnumDests* functions. The caller is responsible * for calling cupsFreeDests() on the returned object(s). * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int @@ -915,7 +915,7 @@ _cupsCreateDest(const char *name, /* I - Printer name */ * Enumeration happens on the current thread and does not return until all * destinations have been enumerated or the callback function returns 0. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -1250,7 +1250,7 @@ cupsEnumDests( * Enumeration happens on the current thread and does not return until all * destinations have been enumerated or the block returns 0. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -1420,7 +1420,7 @@ _cupsGetDestResource( * * "uri" is the "ipp" or "ipps" URI for the printer. * - * @since CUPS 2.0/OS X 10.10@ + * @since CUPS 2.0/macOS 10.10@ */ cups_dest_t * /* O - Destination or @code NULL@ */ @@ -1524,7 +1524,7 @@ cupsGetDestWithURI(const char *name, /* I - Desired printer name or @code NULL@ * Free the memory used by the destination array using the @link cupsFreeDests@ * function. * - * Note: On OS X this function also gets the default paper from the system + * Note: On macOS this function also gets the default paper from the system * preferences (~/L/P/org.cups.PrintingPrefs.plist) and includes it in the * options array for each destination that supports it. */ @@ -1817,7 +1817,7 @@ cupsGetDests(cups_dest_t **dests) /* O - Destinations */ * Use the @link cupsFreeDests@ function to free the destination list and * the @link cupsGetDest@ function to find a particular destination. * - * @since CUPS 1.1.21/OS X 10.4@ + * @since CUPS 1.1.21/macOS 10.4@ */ int /* O - Number of destinations */ @@ -1994,7 +1994,7 @@ cupsGetDests2(http_t *http, /* I - Connection to server or @code CUPS_HTTP_ * The returned destination must be freed using @link cupsFreeDests@ with a * "num_dests" value of 1. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ cups_dest_t * /* O - Destination or @code NULL@ */ @@ -2108,7 +2108,7 @@ cupsGetNamedDest(http_t *http, /* I - Connection to server or @code CUPS_HTT * @link cupsSetDests@ or @link cupsSetDests2@ functions to save the new * options for the user. * - * @since CUPS 1.3/OS X 10.5@ + * @since CUPS 1.3/macOS 10.5@ */ int /* O - New number of destinations */ @@ -2154,7 +2154,7 @@ cupsRemoveDest(const char *name, /* I - Destination name */ /* * 'cupsSetDefaultDest()' - Set the default destination. * - * @since CUPS 1.3/OS X 10.5@ + * @since CUPS 1.3/macOS 10.5@ */ void @@ -2209,7 +2209,7 @@ cupsSetDests(int num_dests, /* I - Number of destinations */ * This function saves the destinations to /etc/cups/lpoptions when run * as root and ~/.cups/lpoptions when run as a normal user. * - * @since CUPS 1.1.21/OS X 10.4@ + * @since CUPS 1.1.21/macOS 10.4@ */ int /* O - 0 on success, -1 on error */ @@ -2435,7 +2435,7 @@ cupsSetDests2(http_t *http, /* I - Connection to server or @code CUPS_HTTP_ #ifdef HAVE_NOTIFY_POST /* - * Send a notification so that MacOS X applications can know about the + * Send a notification so that MacmacOS applications can know about the * change, too. */ diff --git a/cups/dir.c b/cups/dir.c index 7abe39be8..074e65942 100644 --- a/cups/dir.c +++ b/cups/dir.c @@ -65,7 +65,7 @@ _cups_dir_time(FILETIME ft) /* I - File time */ /* * 'cupsDirClose()' - Close a directory. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void @@ -96,7 +96,7 @@ cupsDirClose(cups_dir_t *dp) /* I - Directory pointer */ /* * 'cupsDirOpen()' - Open a directory. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ cups_dir_t * /* O - Directory pointer or @code NULL@ if the directory could not be opened. */ @@ -139,7 +139,7 @@ cupsDirOpen(const char *directory) /* I - Directory name */ /* * 'cupsDirRead()' - Read the next directory entry. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ cups_dentry_t * /* O - Directory entry or @code NULL@ if there are no more */ @@ -199,7 +199,7 @@ cupsDirRead(cups_dir_t *dp) /* I - Directory pointer */ /* * 'cupsDirRewind()' - Rewind to the start of the directory. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void @@ -249,7 +249,7 @@ struct _cups_dir_s /**** Directory data structure ****/ /* * 'cupsDirClose()' - Close a directory. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void @@ -276,7 +276,7 @@ cupsDirClose(cups_dir_t *dp) /* I - Directory pointer */ /* * 'cupsDirOpen()' - Open a directory. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ cups_dir_t * /* O - Directory pointer or @code NULL@ if the directory could not be opened. */ @@ -330,7 +330,7 @@ cupsDirOpen(const char *directory) /* I - Directory name */ /* * 'cupsDirRead()' - Read the next directory entry. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ cups_dentry_t * /* O - Directory entry or @code NULL@ when there are no more */ @@ -428,7 +428,7 @@ cupsDirRead(cups_dir_t *dp) /* I - Directory pointer */ /* * 'cupsDirRewind()' - Rewind to the start of the directory. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void diff --git a/cups/encode.c b/cups/encode.c index 6416cd524..d26d86d36 100644 --- a/cups/encode.c +++ b/cups/encode.c @@ -357,7 +357,7 @@ cupsEncodeOptions(ipp_t *ipp, /* I - Request to add to */ * function multiple times for each group, or use cupsEncodeOptions() * to add the standard groups. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void diff --git a/cups/file.c b/cups/file.c index 03d0f33e4..b81bfe88a 100644 --- a/cups/file.c +++ b/cups/file.c @@ -312,7 +312,7 @@ _cupsFileCheckFilter( /* * 'cupsFileClose()' - Close a CUPS file. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 0 on success, -1 on error */ @@ -444,7 +444,7 @@ cupsFileClose(cups_file_t *fp) /* I - CUPS file */ /* * 'cupsFileCompression()' - Return whether a file is compressed. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - @code CUPS_FILE_NONE@ or @code CUPS_FILE_GZIP@ */ @@ -457,7 +457,7 @@ cupsFileCompression(cups_file_t *fp) /* I - CUPS file */ /* * 'cupsFileEOF()' - Return the end-of-file status. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 1 on end of file, 0 otherwise */ @@ -476,7 +476,7 @@ cupsFileEOF(cups_file_t *fp) /* I - CUPS file */ * the supplied paths, @code NULL@ is returned. A @code NULL@ path only * matches the current directory. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ const char * /* O - Full path to file or @code NULL@ if not found */ @@ -577,7 +577,7 @@ cupsFileFind(const char *filename, /* I - File to find */ /* * 'cupsFileFlush()' - Flush pending output. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 0 on success, -1 on error */ @@ -625,7 +625,7 @@ cupsFileFlush(cups_file_t *fp) /* I - CUPS file */ /* * 'cupsFileGetChar()' - Get a single character from a file. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - Character or -1 on end of file */ @@ -673,7 +673,7 @@ cupsFileGetChar(cups_file_t *fp) /* I - CUPS file */ /* * 'cupsFileGetConf()' - Get a line from a configuration file. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ char * /* O - Line read or @code NULL@ on end of file or error */ @@ -816,7 +816,7 @@ cupsFileGetConf(cups_file_t *fp, /* I - CUPS file */ * nul-terminated, however you should use the returned length to determine * the number of bytes on the line. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ size_t /* O - Number of bytes on line or 0 on end of file */ @@ -890,7 +890,7 @@ cupsFileGetLine(cups_file_t *fp, /* I - File to read from */ /* * 'cupsFileGets()' - Get a CR and/or LF-terminated line. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ char * /* O - Line read or @code NULL@ on end of file or error */ @@ -971,7 +971,7 @@ cupsFileGets(cups_file_t *fp, /* I - CUPS file */ /* * 'cupsFileLock()' - Temporarily lock access to a file. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 0 on success, -1 on error */ @@ -1000,7 +1000,7 @@ cupsFileLock(cups_file_t *fp, /* I - CUPS file */ /* * 'cupsFileNumber()' - Return the file descriptor associated with a CUPS file. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - File descriptor */ @@ -1029,7 +1029,7 @@ cupsFileNumber(cups_file_t *fp) /* I - CUPS file */ * connection as needed, generally preferring IPv6 connections when there is * a choice. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ cups_file_t * /* O - CUPS file or @code NULL@ if the file or socket cannot be opened */ @@ -1151,7 +1151,7 @@ cupsFileOpen(const char *filename, /* I - Name of file */ * supplied which enables Flate compression of the file. Compression is * not supported for the "a" (append) mode. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ cups_file_t * /* O - CUPS file or @code NULL@ if the file could not be opened */ @@ -1263,7 +1263,7 @@ cupsFileOpenFd(int fd, /* I - File descriptor */ /* * 'cupsFilePeekChar()' - Peek at the next character from a file. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - Character or -1 on end of file */ @@ -1295,7 +1295,7 @@ cupsFilePeekChar(cups_file_t *fp) /* I - CUPS file */ /* * 'cupsFilePrintf()' - Write a formatted string. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - Number of bytes written or -1 on error */ @@ -1392,7 +1392,7 @@ cupsFilePrintf(cups_file_t *fp, /* I - CUPS file */ /* * 'cupsFilePutChar()' - Write a character. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 0 on success, -1 on error */ @@ -1446,7 +1446,7 @@ cupsFilePutChar(cups_file_t *fp, /* I - CUPS file */ * * This function handles any comment escaping of the value. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ ssize_t /* O - Number of bytes written or -1 on error */ @@ -1507,7 +1507,7 @@ cupsFilePutConf(cups_file_t *fp, /* I - CUPS file */ * * Like the @code fputs@ function, no newline is appended to the string. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - Number of bytes written or -1 on error */ @@ -1571,7 +1571,7 @@ cupsFilePuts(cups_file_t *fp, /* I - CUPS file */ /* * 'cupsFileRead()' - Read from a file. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ssize_t /* O - Number of bytes read or -1 on error */ @@ -1647,7 +1647,7 @@ cupsFileRead(cups_file_t *fp, /* I - CUPS file */ * 'cupsFileRewind()' - Set the current file position to the beginning of the * file. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ off_t /* O - New file position or -1 on error */ @@ -1719,7 +1719,7 @@ cupsFileRewind(cups_file_t *fp) /* I - CUPS file */ /* * 'cupsFileSeek()' - Seek in a file. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ off_t /* O - New file position or -1 on error */ @@ -1871,7 +1871,7 @@ cupsFileSeek(cups_file_t *fp, /* I - CUPS file */ /* * 'cupsFileStderr()' - Return a CUPS file associated with stderr. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ cups_file_t * /* O - CUPS file */ @@ -1907,7 +1907,7 @@ cupsFileStderr(void) /* * 'cupsFileStdin()' - Return a CUPS file associated with stdin. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ cups_file_t * /* O - CUPS file */ @@ -1937,7 +1937,7 @@ cupsFileStdin(void) /* * 'cupsFileStdout()' - Return a CUPS file associated with stdout. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ cups_file_t * /* O - CUPS file */ @@ -1973,7 +1973,7 @@ cupsFileStdout(void) /* * 'cupsFileTell()' - Return the current file position. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ off_t /* O - File position */ @@ -1989,7 +1989,7 @@ cupsFileTell(cups_file_t *fp) /* I - CUPS file */ /* * 'cupsFileUnlock()' - Unlock access to a file. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 0 on success, -1 on error */ @@ -2019,7 +2019,7 @@ cupsFileUnlock(cups_file_t *fp) /* I - CUPS file */ /* * 'cupsFileWrite()' - Write to a file. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ssize_t /* O - Number of bytes written or -1 on error */ diff --git a/cups/getdevices.c b/cups/getdevices.c index 35df489a2..13bebd2ff 100644 --- a/cups/getdevices.c +++ b/cups/getdevices.c @@ -29,7 +29,7 @@ * parameters provide comma-delimited lists of backends to include or omit from * the request respectively. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ ipp_status_t /* O - Request status - @code IPP_OK@ on success. */ diff --git a/cups/getputfile.c b/cups/getputfile.c index d71d52797..76a309361 100644 --- a/cups/getputfile.c +++ b/cups/getputfile.c @@ -32,7 +32,7 @@ * * This function returns @code HTTP_STATUS_OK@ when the file is successfully retrieved. * - * @since CUPS 1.1.20/OS X 10.4@ + * @since CUPS 1.1.20/macOS 10.4@ */ http_status_t /* O - HTTP status */ @@ -187,7 +187,7 @@ cupsGetFd(http_t *http, /* I - Connection to server or @code CUPS_HTTP_DEFA * * This function returns @code HTTP_STATUS_OK@ when the file is successfully retrieved. * - * @since CUPS 1.1.20/OS X 10.4@ + * @since CUPS 1.1.20/macOS 10.4@ */ http_status_t /* O - HTTP status */ @@ -255,7 +255,7 @@ cupsGetFile(http_t *http, /* I - Connection to server or @code CUPS_HTTP_DE * This function returns @code HTTP_STATUS_CREATED@ when the file is stored * successfully. * - * @since CUPS 1.1.20/OS X 10.4@ + * @since CUPS 1.1.20/macOS 10.4@ */ http_status_t /* O - HTTP status */ @@ -455,7 +455,7 @@ cupsPutFd(http_t *http, /* I - Connection to server or @code CUPS_HTTP_DEFA * This function returns @code HTTP_CREATED@ when the file is stored * successfully. * - * @since CUPS 1.1.20/OS X 10.4@ + * @since CUPS 1.1.20/macOS 10.4@ */ http_status_t /* O - HTTP status */ diff --git a/cups/http-addr.c b/cups/http-addr.c index ad202c1f2..dd61d4a09 100644 --- a/cups/http-addr.c +++ b/cups/http-addr.c @@ -31,7 +31,7 @@ /* * 'httpAddrAny()' - Check for the "any" address. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 1 if "any", 0 otherwise */ @@ -88,7 +88,7 @@ httpAddrClose(http_addr_t *addr, /* I - Listen address or @code NULL@ */ /* * 'httpAddrEqual()' - Compare two addresses. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 1 if equal, 0 if not */ @@ -121,7 +121,7 @@ httpAddrEqual(const http_addr_t *addr1, /* I - First address */ /* * 'httpAddrLength()' - Return the length of the address in bytes. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - Length in bytes */ @@ -152,7 +152,7 @@ httpAddrLength(const http_addr_t *addr) /* I - Address */ * 'httpAddrListen()' - Create a listening socket bound to the specified * address and port. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ int /* O - Socket or -1 on error */ @@ -278,7 +278,7 @@ httpAddrListen(http_addr_t *addr, /* I - Address to bind to */ /* * 'httpAddrLocalhost()' - Check for the local loopback address. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 1 if local host, 0 otherwise */ @@ -310,7 +310,7 @@ httpAddrLocalhost( /* * 'httpAddrLookup()' - Lookup the hostname associated with the address. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ char * /* O - Host name */ @@ -449,7 +449,7 @@ httpAddrFamily(http_addr_t *addr) /* I - Address */ /* * 'httpAddrPort()' - Get the port number associated with an address. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ int /* O - Port number */ @@ -492,7 +492,7 @@ _httpAddrSetPort(http_addr_t *addr, /* I - Address */ /* * 'httpAddrString()' - Convert an address to a numeric string. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ char * /* O - Numeric address string */ @@ -781,7 +781,7 @@ httpGetHostByName(const char *name) /* I - Hostname or IP address */ * Otherwise, return the FQDN for the local system using both gethostname() * and gethostbyname() to get the local hostname with domain. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ const char * /* O - FQDN for connection or system */ diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c index f74d9ed7a..a8237eb03 100644 --- a/cups/http-addrlist.c +++ b/cups/http-addrlist.c @@ -32,7 +32,7 @@ /* * 'httpAddrConnect()' - Connect to any of the addresses in the list. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ http_addrlist_t * /* O - Connected address or NULL on failure */ @@ -50,7 +50,7 @@ httpAddrConnect( * 'httpAddrConnect2()' - Connect to any of the addresses in the list with a * timeout and optional cancel. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ http_addrlist_t * /* O - Connected address or NULL on failure */ @@ -344,7 +344,7 @@ httpAddrConnect2( /* * 'httpAddrCopyList()' - Copy an address list. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ http_addrlist_t * /* O - New address list or @code NULL@ on error */ @@ -393,7 +393,7 @@ httpAddrCopyList( /* * 'httpAddrFreeList()' - Free an address list. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void @@ -421,7 +421,7 @@ httpAddrFreeList( /* * 'httpAddrGetList()' - Get a list of addresses for a hostname. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ http_addrlist_t * /* O - List of addresses or NULL */ diff --git a/cups/http-private.h b/cups/http-private.h index 89e61d459..7ab000827 100644 --- a/cups/http-private.h +++ b/cups/http-private.h @@ -60,7 +60,7 @@ # if defined(__APPLE__) && !defined(_SOCKLEN_T) /* - * MacOS X 10.2.x does not define socklen_t, and in fact uses an int instead of + * MacmacOS 10.2.x does not define socklen_t, and in fact uses an int instead of * unsigned type for length values... */ diff --git a/cups/http-support.c b/cups/http-support.c index 29e9f254d..2af48148e 100644 --- a/cups/http-support.c +++ b/cups/http-support.c @@ -150,7 +150,7 @@ static void http_resolve_cb(AvahiServiceResolver *resolver, * place of traditional string functions whenever you need to create a * URI string. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ http_uri_status_t /* O - URI status */ @@ -430,7 +430,7 @@ httpAssembleURI( * this function in place of traditional string functions whenever * you need to create a URI string. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ http_uri_status_t /* O - URI status */ @@ -490,7 +490,7 @@ httpAssembleURIf( * * The buffer needs to be at least 46 bytes in size. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ char * /* I - UUID string */ @@ -566,7 +566,7 @@ httpDecode64(char *out, /* I - String to write to */ /* * 'httpDecode64_2()' - Base64-decode a string. * - * @since CUPS 1.1.21/OS X 10.4@ + * @since CUPS 1.1.21/macOS 10.4@ */ char * /* O - Decoded string */ @@ -685,7 +685,7 @@ httpEncode64(char *out, /* I - String to write to */ /* * 'httpEncode64_2()' - Base64-encode a string. * - * @since CUPS 1.1.21/OS X 10.4@ + * @since CUPS 1.1.21/macOS 10.4@ */ char * /* O - Encoded string */ @@ -794,7 +794,7 @@ httpGetDateString(time_t t) /* I - UNIX time */ /* * 'httpGetDateString2()' - Get a formatted date/time string from a time value. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ const char * /* O - Date/time string */ @@ -911,7 +911,7 @@ httpSeparate(const char *uri, /* I - Universal Resource Identifier */ * * This function is deprecated; use the httpSeparateURI() function instead. * - * @since CUPS 1.1.21/OS X 10.4@ + * @since CUPS 1.1.21/macOS 10.4@ * @deprecated@ */ @@ -936,7 +936,7 @@ httpSeparate2(const char *uri, /* I - Universal Resource Identifier */ * 'httpSeparateURI()' - Separate a Universal Resource Identifier into its * components. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ http_uri_status_t /* O - Result of separation */ diff --git a/cups/http.c b/cups/http.c index 565306ddb..b3abbe73e 100644 --- a/cups/http.c +++ b/cups/http.c @@ -113,7 +113,7 @@ static const char * const http_fields[] = * 'httpAcceptConnection()' - Accept a new HTTP client connection from the * specified listening socket. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ http_t * /* O - HTTP connection or @code NULL@ */ @@ -203,7 +203,7 @@ httpAcceptConnection(int fd, /* I - Listen socket file descriptor */ * * Use @code cupsArrayNew(NULL, NULL)@ to create a credentials array. * - * @since CUPS 1.5/OS X 10.7@ + * @since CUPS 1.5/macOS 10.7@ */ int /* O - 0 on success, -1 on error */ @@ -263,7 +263,7 @@ httpCheck(http_t *http) /* I - HTTP connection */ /* * 'httpClearCookie()' - Clear the cookie value(s). * - * @since CUPS 1.1.19/OS X 10.3@ + * @since CUPS 1.1.19/macOS 10.3@ */ void @@ -432,7 +432,7 @@ httpConnect(const char *host, /* I - Host to connect to */ /* * 'httpConnect2()' - Connect to a HTTP server. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ http_t * /* O - New HTTP connection */ @@ -681,7 +681,7 @@ httpFlush(http_t *http) /* I - HTTP connection */ /* * 'httpFlushWrite()' - Flush data in write buffer. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - Bytes written or -1 on error */ @@ -771,7 +771,7 @@ httpGetActivity(http_t *http) /* I - HTTP connection */ * string to use with httpSetField() for the HTTP_FIELD_AUTHORIZATION * value. * - * @since CUPS 1.3/OS X 10.5@ + * @since CUPS 1.3/macOS 10.5@ */ char * /* O - Authorization string */ @@ -787,7 +787,7 @@ httpGetAuthString(http_t *http) /* I - HTTP connection */ /* * 'httpGetBlocking()' - Get the blocking/non-block state of a connection. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 1 if blocking, 0 if non-blocking */ @@ -806,7 +806,7 @@ httpGetBlocking(http_t *http) /* I - HTTP connection */ * client. The value returned can be use in subsequent requests (for clients) * or in the response (for servers) in order to compress the content stream. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ const char * /* O - Content-Coding value or @@ -888,7 +888,7 @@ httpGetContentEncoding(http_t *http) /* I - HTTP connection */ /* * 'httpGetCookie()' - Get any cookie data from the response. * - * @since CUPS 1.1.19/OS X 10.3@ + * @since CUPS 1.1.19/macOS 10.3@ */ const char * /* O - Cookie data or NULL */ @@ -921,7 +921,7 @@ httpGetEncryption(http_t *http) /* I - HTTP connection */ * Returns @code HTTP_STATUS_NONE@ if there is no Expect header, otherwise * returns the expected HTTP status code, typically @code HTTP_STATUS_CONTINUE@. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ http_status_t /* O - Expect: status, if any */ @@ -937,7 +937,7 @@ httpGetExpect(http_t *http) /* I - HTTP connection */ /* * 'httpGetFd()' - Get the file descriptor associated with a connection. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - File descriptor or -1 if none */ @@ -1034,7 +1034,7 @@ httpGetLength(http_t *http) /* I - HTTP connection */ * This function returns the complete content length, even for * content larger than 2^31 - 1. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ off_t /* O - Content length */ @@ -1333,7 +1333,7 @@ httpGetState(http_t *http) /* I - HTTP connection */ /* * 'httpGetStatus()' - Get the status of the last HTTP request. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ http_status_t /* O - HTTP status */ @@ -1362,7 +1362,7 @@ httpGetSubField(http_t *http, /* I - HTTP connection */ /* * 'httpGetSubField2()' - Get a sub-field value. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ char * /* O - Value or NULL */ @@ -1620,7 +1620,7 @@ httpOptions(http_t *http, /* I - HTTP connection */ * * For non-blocking connections the usual timeouts apply. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ ssize_t /* O - Number of bytes copied */ @@ -1954,7 +1954,7 @@ httpRead(http_t *http, /* I - HTTP connection */ /* * 'httpRead2()' - Read data from a HTTP connection. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ssize_t /* O - Number of bytes read */ @@ -2161,7 +2161,7 @@ httpRead2(http_t *http, /* I - HTTP connection */ /* * 'httpReadRequest()' - Read a HTTP request from a connection. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ http_state_t /* O - New state of connection */ @@ -2471,7 +2471,7 @@ httpReconnect2(http_t *http, /* I - HTTP connection */ * HTTP_FIELD_AUTHORIZATION prior to issuing a HTTP request using httpGet(), * httpHead(), httpOptions(), httpPost, or httpPut(). * - * @since CUPS 1.3/OS X 10.5@ + * @since CUPS 1.3/macOS 10.5@ */ void @@ -2528,7 +2528,7 @@ httpSetAuthString(http_t *http, /* I - HTTP connection */ * 'httpSetCredentials()' - Set the credentials associated with an encrypted * connection. * - * @since CUPS 1.5/OS X 10.7@ + * @since CUPS 1.5/macOS 10.7@ */ int /* O - Status of call (0 = success) */ @@ -2551,7 +2551,7 @@ httpSetCredentials(http_t *http, /* I - HTTP connection */ /* * 'httpSetCookie()' - Set the cookie value(s). * - * @since CUPS 1.1.19/OS X 10.3@ + * @since CUPS 1.1.19/macOS 10.3@ */ void @@ -2577,7 +2577,7 @@ httpSetCookie(http_t *http, /* I - Connection */ * Currently only @code HTTP_FIELD_ACCEPT_ENCODING@, @code HTTP_FIELD_SERVER@, * and @code HTTP_FIELD_USER_AGENT@ can be set. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ void @@ -2626,7 +2626,7 @@ httpSetDefaultField(http_t *http, /* I - HTTP connection */ * Currently only @code HTTP_STATUS_CONTINUE@ is supported for the "expect" * argument. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void @@ -2779,7 +2779,7 @@ httpSetKeepAlive( /* * 'httpSetLength()' - Set the content-length and content-encoding. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ void @@ -2812,7 +2812,7 @@ httpSetLength(http_t *http, /* I - HTTP connection */ * The optional timeout callback receives both the HTTP connection and a user * data pointer and must return 1 to continue or 0 to error (time) out. * - * @since CUPS 1.5/OS X 10.7@ + * @since CUPS 1.5/macOS 10.7@ */ void @@ -3203,7 +3203,7 @@ _httpWait(http_t *http, /* I - HTTP connection */ /* * 'httpWait()' - Wait for data available on a connection. * - * @since CUPS 1.1.19/OS X 10.3@ + * @since CUPS 1.1.19/macOS 10.3@ */ int /* O - 1 if data is available, 0 otherwise */ @@ -3274,7 +3274,7 @@ httpWrite(http_t *http, /* I - HTTP connection */ /* * 'httpWrite2()' - Write data to a HTTP connection. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ssize_t /* O - Number of bytes written */ @@ -3465,7 +3465,7 @@ httpWrite2(http_t *http, /* I - HTTP connection */ /* * 'httpWriteResponse()' - Write a HTTP response to a client connection. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ int /* O - 0 on success, -1 on error */ diff --git a/cups/http.h b/cups/http.h index 03906393a..00039ee51 100644 --- a/cups/http.h +++ b/cups/http.h @@ -117,7 +117,7 @@ typedef enum http_auth_e /**** HTTP authentication types ****/ HTTP_AUTH_MD5_SESS, /* MD5-session authentication in use */ HTTP_AUTH_MD5_INT, /* Digest authentication in use for body */ HTTP_AUTH_MD5_SESS_INT, /* MD5-session authentication in use for body */ - HTTP_AUTH_NEGOTIATE /* GSSAPI authentication in use @since CUPS 1.3/OS X 10.5@ */ + HTTP_AUTH_NEGOTIATE /* GSSAPI authentication in use @since CUPS 1.3/macOS 10.5@ */ } http_auth_t; typedef enum http_encoding_e /**** HTTP transfer encoding values ****/ @@ -178,9 +178,9 @@ typedef enum http_field_e /**** HTTP field names ****/ HTTP_FIELD_UPGRADE, /* Upgrade field */ HTTP_FIELD_USER_AGENT, /* User-Agent field */ HTTP_FIELD_WWW_AUTHENTICATE, /* WWW-Authenticate field */ - HTTP_FIELD_ACCEPT_ENCODING, /* Accepting-Encoding field @since CUPS 1.7/OS X 10.9@ */ - HTTP_FIELD_ALLOW, /* Allow field @since CUPS 1.7/OS X 10.9@ */ - HTTP_FIELD_SERVER, /* Server field @since CUPS 1.7/OS X 10.9@ */ + HTTP_FIELD_ACCEPT_ENCODING, /* Accepting-Encoding field @since CUPS 1.7/macOS 10.9@ */ + HTTP_FIELD_ALLOW, /* Allow field @since CUPS 1.7/macOS 10.9@ */ + HTTP_FIELD_SERVER, /* Server field @since CUPS 1.7/macOS 10.9@ */ HTTP_FIELD_MAX /* Maximum field index */ } http_field_t; @@ -209,8 +209,8 @@ typedef enum http_state_e /**** HTTP state values; states HTTP_STATE_TRACE, /* TRACE command, waiting for blank line */ HTTP_STATE_CONNECT, /* CONNECT command, waiting for blank line */ HTTP_STATE_STATUS, /* Command complete, sending status */ - HTTP_STATE_UNKNOWN_METHOD, /* Unknown request method, waiting for blank line @since CUPS 1.7/OS X 10.9@ */ - HTTP_STATE_UNKNOWN_VERSION /* Unknown request method, waiting for blank line @since CUPS 1.7/OS X 10.9@ */ + HTTP_STATE_UNKNOWN_METHOD, /* Unknown request method, waiting for blank line @since CUPS 1.7/macOS 10.9@ */ + HTTP_STATE_UNKNOWN_VERSION /* Unknown request method, waiting for blank line @since CUPS 1.7/macOS 10.9@ */ # ifndef _CUPS_NO_DEPRECATED # define HTTP_WAITING HTTP_STATE_WAITING @@ -233,7 +233,7 @@ typedef enum http_state_e /**** HTTP state values; states typedef enum http_status_e /**** HTTP status codes ****/ { HTTP_STATUS_ERROR = -1, /* An error response from httpXxxx() */ - HTTP_STATUS_NONE = 0, /* No Expect value @since CUPS 1.7/OS X 10.9@ */ + HTTP_STATUS_NONE = 0, /* No Expect value @since CUPS 1.7/macOS 10.9@ */ HTTP_STATUS_CONTINUE = 100, /* Everything OK, keep going... */ HTTP_STATUS_SWITCHING_PROTOCOLS, /* HTTP upgrade to TLS/SSL */ @@ -282,7 +282,7 @@ typedef enum http_status_e /**** HTTP status codes ****/ HTTP_STATUS_CUPS_AUTHORIZATION_CANCELED = 1000, /* User canceled authorization @since CUPS 1.4@ */ - HTTP_STATUS_CUPS_PKI_ERROR, /* Error negotiating a secure connection @since CUPS 1.5/OS X 10.7@ */ + HTTP_STATUS_CUPS_PKI_ERROR, /* Error negotiating a secure connection @since CUPS 1.5/macOS 10.7@ */ HTTP_STATUS_CUPS_WEBIF_DISABLED /* Web interface is disabled @private@ */ # ifndef _CUPS_NO_DEPRECATED @@ -409,7 +409,7 @@ typedef enum http_version_e /**** HTTP version numbers ****/ typedef union _http_addr_u /**** Socket address union, which **** makes using IPv6 and other **** address types easier and - **** more portable. @since CUPS 1.2/OS X 10.5@ + **** more portable. @since CUPS 1.2/macOS 10.5@ ****/ { struct sockaddr addr; /* Base structure for family value */ @@ -426,7 +426,7 @@ typedef union _http_addr_u /**** Socket address union, which typedef struct http_addrlist_s /**** Socket address list, which is **** used to enumerate all of the **** addresses that are associated - **** with a hostname. @since CUPS 1.2/OS X 10.5@ + **** with a hostname. @since CUPS 1.2/macOS 10.5@ ****/ { struct http_addrlist_s *next; /* Pointer to next address in list */ @@ -435,14 +435,14 @@ typedef struct http_addrlist_s /**** Socket address list, which is typedef struct _http_s http_t; /**** HTTP connection type ****/ -typedef struct http_credential_s /**** HTTP credential data @since CUPS 1.5/OS X 10.7@ ****/ +typedef struct http_credential_s /**** HTTP credential data @since CUPS 1.5/macOS 10.7@ ****/ { void *data; /* Pointer to credential data */ size_t datalen; /* Credential length */ } http_credential_t; typedef int (*http_timeout_cb_t)(http_t *http, void *user_data); - /**** HTTP timeout callback @since CUPS 1.5/OS X 10.7@ ****/ + /**** HTTP timeout callback @since CUPS 1.5/macOS 10.7@ ****/ @@ -514,7 +514,7 @@ extern void httpSeparate2(const char *uri, char *host, int hostlen, int *port, char *resource, int resourcelen) _CUPS_DEPRECATED_MSG("Use httpSeparateURI instead."); -/**** New in CUPS 1.2/OS X 10.5 ****/ +/**** New in CUPS 1.2/macOS 10.5 ****/ extern int httpAddrAny(const http_addr_t *addr) _CUPS_API_1_2; extern http_addrlist_t *httpAddrConnect(http_addrlist_t *addrlist, int *sock) _CUPS_API_1_2; extern int httpAddrEqual(const http_addr_t *addr1, @@ -562,12 +562,12 @@ extern void httpSetLength(http_t *http, size_t length) _CUPS_API_1_2; extern ssize_t httpWrite2(http_t *http, const char *buffer, size_t length) _CUPS_API_1_2; -/**** New in CUPS 1.3/OS X 10.5 ****/ +/**** New in CUPS 1.3/macOS 10.5 ****/ extern char *httpGetAuthString(http_t *http) _CUPS_API_1_3; extern void httpSetAuthString(http_t *http, const char *scheme, const char *data) _CUPS_API_1_3; -/**** New in CUPS 1.5/OS X 10.7 ****/ +/**** New in CUPS 1.5/macOS 10.7 ****/ extern int httpAddCredential(cups_array_t *credentials, const void *data, size_t datalen) _CUPS_API_1_5; @@ -581,7 +581,7 @@ extern void httpSetTimeout(http_t *http, double timeout, http_timeout_cb_t cb, void *user_data) _CUPS_API_1_5; -/**** New in CUPS 1.6/OS X 10.8 ****/ +/**** New in CUPS 1.6/macOS 10.8 ****/ extern http_addrlist_t *httpAddrConnect2(http_addrlist_t *addrlist, int *sock, int msec, int *cancel) _CUPS_API_1_6; @@ -591,7 +591,7 @@ extern int httpReconnect2(http_t *http, int msec, int *cancel) _CUPS_API_1_6; -/**** New in CUPS 1.7/OS X 10.9 ****/ +/**** New in CUPS 1.7/macOS 10.9 ****/ extern http_t *httpAcceptConnection(int fd, int blocking) _CUPS_API_1_7; extern http_addrlist_t *httpAddrCopyList(http_addrlist_t *src) _CUPS_API_1_7; @@ -618,7 +618,7 @@ extern void httpSetDefaultField(http_t *http, http_field_t field, extern http_state_t httpWriteResponse(http_t *http, http_status_t status) _CUPS_API_1_7; -/* New in CUPS 2.0/OS X 10.10 */ +/* New in CUPS 2.0/macOS 10.10 */ extern int httpAddrClose(http_addr_t *addr, int fd) _CUPS_API_2_0; extern int httpAddrFamily(http_addr_t *addr) _CUPS_API_2_0; extern int httpCompareCredentials(cups_array_t *cred1, cups_array_t *cred2) _CUPS_API_2_0; diff --git a/cups/ipp-support.c b/cups/ipp-support.c index 7847a35f0..46a44fbfd 100644 --- a/cups/ipp-support.c +++ b/cups/ipp-support.c @@ -608,7 +608,7 @@ static size_t ipp_col_string(ipp_t *col, char *buffer, size_t bufsize); * trailing nul. The buffer pointer can be NULL to get the required length, * just like (v)snprintf. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ size_t /* O - Number of bytes less nul */ @@ -839,7 +839,7 @@ ippAttributeString( * "attribute-name")@ will return a non-NULL pointer. The array must be freed * using the @code cupsArrayDelete@ function. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ cups_array_t * /* O - CUPS array or @code NULL@ if all */ @@ -1988,7 +1988,7 @@ ippErrorString(ipp_status_t error) /* I - Error status */ /* * 'ippErrorValue()' - Return a status code for the given name. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ipp_status_t /* O - IPP status code */ @@ -2030,7 +2030,7 @@ ippErrorValue(const char *name) /* I - Name */ /* * 'ippOpString()' - Return a name for the given operation id. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ const char * /* O - Name */ @@ -2065,7 +2065,7 @@ ippOpString(ipp_op_t op) /* I - Operation ID */ /* * 'ippOpValue()' - Return an operation id for the given name. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ipp_op_t /* O - Operation ID */ @@ -2163,7 +2163,7 @@ ippStateString(ipp_state_t state) /* I - State value */ * * The returned names are defined in RFC 2911 and 3382. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ const char * /* O - Tag name */ @@ -2183,7 +2183,7 @@ ippTagString(ipp_tag_t tag) /* I - Tag value */ * * The tag names are defined in RFC 2911 and 3382. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ ipp_tag_t /* O - Tag value */ diff --git a/cups/ipp.c b/cups/ipp.c index 4e1e8c8d4..1964962ce 100644 --- a/cups/ipp.c +++ b/cups/ipp.c @@ -215,7 +215,7 @@ ippAddBooleans(ipp_t *ipp, /* I - IPP message */ * (@code IPP_TAG_OPERATION@), printer (@code IPP_TAG_PRINTER@), subscription * (@code IPP_TAG_SUBSCRIPTION@), or unsupported (@code IPP_TAG_UNSUPPORTED_GROUP@). * - * @since CUPS 1.1.19/OS X 10.3@ + * @since CUPS 1.1.19/macOS 10.3@ */ ipp_attribute_t * /* O - New attribute */ @@ -265,7 +265,7 @@ ippAddCollection(ipp_t *ipp, /* I - IPP message */ * (@code IPP_TAG_OPERATION@), printer (@code IPP_TAG_PRINTER@), subscription * (@code IPP_TAG_SUBSCRIPTION@), or unsupported (@code IPP_TAG_UNSUPPORTED_GROUP@). * - * @since CUPS 1.1.19/OS X 10.3@ + * @since CUPS 1.1.19/macOS 10.3@ */ ipp_attribute_t * /* O - New attribute */ @@ -507,7 +507,7 @@ ippAddIntegers(ipp_t *ipp, /* I - IPP message */ * (@code IPP_TAG_OPERATION@), printer (@code IPP_TAG_PRINTER@), subscription * (@code IPP_TAG_SUBSCRIPTION@), or unsupported (@code IPP_TAG_UNSUPPORTED_GROUP@). * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ipp_attribute_t * /* O - New attribute */ @@ -571,7 +571,7 @@ ippAddOctetString(ipp_t *ipp, /* I - IPP message */ * (@code IPP_TAG_NOTSETTABLE@), delete-attribute (@code IPP_TAG_DELETEATTR@), and * admin-define (@code IPP_TAG_ADMINDEFINE@). * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ ipp_attribute_t * /* O - New attribute */ @@ -999,7 +999,7 @@ ippAddString(ipp_t *ipp, /* I - IPP message */ * needed. The formatted string is truncated as needed to the maximum length of * the corresponding value type. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ ipp_attribute_t * /* O - New attribute */ @@ -1052,7 +1052,7 @@ ippAddStringf(ipp_t *ipp, /* I - IPP message */ * stdarg pointer @code ap@. The formatted string is truncated as needed to the * maximum length of the corresponding value type. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ ipp_attribute_t * /* O - New attribute */ @@ -1331,7 +1331,7 @@ ippAddStrings( * enum value, or the value falls within one of the rangeOfInteger values for * the attribute. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ int /* O - 1 on a match, 0 on no match */ @@ -1382,7 +1382,7 @@ ippContainsInteger( * Returns non-zero when the attribute contains a matching charset, keyword, * language, mimeMediaType, name, text, URI, or URI scheme value. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ int /* O - 1 on a match, 0 on no match */ @@ -1458,7 +1458,7 @@ ippContainsString( * created - this should only be done as long as the original source IPP message will * not be freed for the life of the destination. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ @@ -1708,7 +1708,7 @@ ippCopyAttribute( * 0 to skip it. The function may also choose to do a partial copy of the source attribute * itself. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on error */ @@ -1835,7 +1835,7 @@ ippDelete(ipp_t *ipp) /* I - IPP message */ /* * 'ippDeleteAttribute()' - Delete a single attribute in an IPP message. * - * @since CUPS 1.1.19/OS X 10.3@ + * @since CUPS 1.1.19/macOS 10.3@ */ void @@ -1909,7 +1909,7 @@ ippDeleteAttribute( * * Deleting all values in an attribute deletes the attribute. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -2113,7 +2113,7 @@ ippFindNextAttribute(ipp_t *ipp, /* I - IPP message */ /* * 'ippFirstAttribute()' - Return the first attribute in the message. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ ipp_attribute_t * /* O - First attribute or @code NULL@ if none */ @@ -2140,7 +2140,7 @@ ippFirstAttribute(ipp_t *ipp) /* I - IPP message */ * The @code element@ parameter specifies which value to get from 0 to * @link ippGetCount(attr)@ - 1. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - Boolean value or 0 on error */ @@ -2169,7 +2169,7 @@ ippGetBoolean(ipp_attribute_t *attr, /* I - IPP attribute */ * The @code element@ parameter specifies which value to get from 0 to * @link ippGetCount(attr)@ - 1. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ ipp_t * /* O - Collection value or @code NULL@ on error */ @@ -2196,7 +2196,7 @@ ippGetCollection( /* * 'ippGetCount()' - Get the number of values in an attribute. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - Number of values or 0 on error */ @@ -2223,7 +2223,7 @@ ippGetCount(ipp_attribute_t *attr) /* I - IPP attribute */ * The @code element@ parameter specifies which value to get from 0 to * @link ippGetCount(attr)@ - 1. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ const ipp_uchar_t * /* O - Date value or @code NULL@ */ @@ -2249,7 +2249,7 @@ ippGetDate(ipp_attribute_t *attr, /* I - IPP attribute */ /* * 'ippGetGroupTag()' - Get the group associated with an attribute. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ ipp_tag_t /* O - Group tag or @code IPP_TAG_ZERO@ on error */ @@ -2276,7 +2276,7 @@ ippGetGroupTag(ipp_attribute_t *attr) /* I - IPP attribute */ * The @code element@ parameter specifies which value to get from 0 to * @link ippGetCount(attr)@ - 1. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - Value or 0 on error */ @@ -2302,7 +2302,7 @@ ippGetInteger(ipp_attribute_t *attr, /* I - IPP attribute */ /* * 'ippGetName()' - Get the attribute name. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ const char * /* O - Attribute name or @code NULL@ for separators */ @@ -2329,7 +2329,7 @@ ippGetName(ipp_attribute_t *attr) /* I - IPP attribute */ * The @code element@ parameter specifies which value to get from 0 to * @link ippGetCount(attr)@ - 1. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ void * /* O - Pointer to octetString data */ @@ -2365,7 +2365,7 @@ ippGetOctetString( /* * 'ippGetOperation()' - Get the operation ID in an IPP message. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ ipp_op_t /* O - Operation ID or 0 on error */ @@ -2392,7 +2392,7 @@ ippGetOperation(ipp_t *ipp) /* I - IPP request message */ * The @code element@ parameter specifies which value to get from 0 to * @link ippGetCount(attr)@ - 1. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - Lower value of range or 0 */ @@ -2427,7 +2427,7 @@ ippGetRange(ipp_attribute_t *attr, /* I - IPP attribute */ /* * 'ippGetRequestId()' - Get the request ID from an IPP message. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - Request ID or 0 on error */ @@ -2454,7 +2454,7 @@ ippGetRequestId(ipp_t *ipp) /* I - IPP message */ * The @code element@ parameter specifies which value to get from 0 to * @link ippGetCount(attr)@ - 1. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - Horizontal/cross feed resolution or 0 */ @@ -2497,7 +2497,7 @@ ippGetResolution( /* * 'ippGetState()' - Get the IPP message state. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ ipp_state_t /* O - IPP message state value */ @@ -2521,7 +2521,7 @@ ippGetState(ipp_t *ipp) /* I - IPP message */ /* * 'ippGetStatusCode()' - Get the status code from an IPP response or event message. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ ipp_status_t /* O - Status code in IPP message */ @@ -2548,7 +2548,7 @@ ippGetStatusCode(ipp_t *ipp) /* I - IPP response or event message */ * The @code element@ parameter specifies which value to get from 0 to * @link ippGetCount(attr)@ - 1. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ const char * @@ -2579,7 +2579,7 @@ ippGetString(ipp_attribute_t *attr, /* I - IPP attribute */ /* * 'ippGetValueTag()' - Get the value tag for an attribute. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ ipp_tag_t /* O - Value tag or @code IPP_TAG_ZERO@ on error */ @@ -2603,7 +2603,7 @@ ippGetValueTag(ipp_attribute_t *attr) /* I - IPP attribute */ /* * 'ippGetVersion()' - Get the major and minor version number from an IPP message. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - Major version number or 0 on error */ @@ -2647,7 +2647,7 @@ ippLength(ipp_t *ipp) /* I - IPP message */ /* * 'ippNextAttribute()' - Return the next attribute in the message. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ ipp_attribute_t * /* O - Next attribute or @code NULL@ if none */ @@ -2709,7 +2709,7 @@ ippNew(void) * attributes-natural-language attributes added. The * attributes-natural-language value is derived from the current locale. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ipp_t * /* O - IPP request message */ @@ -2776,7 +2776,7 @@ ippNewRequest(ipp_op_t op) /* I - Operation code */ * "utf-8" and a value derived from the current locale are substituted, * respectively. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ ipp_t * /* O - IPP response message */ @@ -2897,7 +2897,7 @@ ippRead(http_t *http, /* I - HTTP connection */ /* * 'ippReadFile()' - Read data for an IPP message from a file. * - * @since CUPS 1.1.19/OS X 10.3@ + * @since CUPS 1.1.19/macOS 10.3@ */ ipp_state_t /* O - Current state */ @@ -2913,7 +2913,7 @@ ippReadFile(int fd, /* I - HTTP data */ /* * 'ippReadIO()' - Read data for an IPP message. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ipp_state_t /* O - Current state */ @@ -3691,7 +3691,7 @@ ippReadIO(void *src, /* I - Data source */ * The @code element@ parameter specifies which value to set from 0 to * @link ippGetCount(attr)@. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -3733,7 +3733,7 @@ ippSetBoolean(ipp_t *ipp, /* I - IPP message */ * The @code element@ parameter specifies which value to set from 0 to * @link ippGetCount(attr)@. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -3782,7 +3782,7 @@ ippSetCollection( * The @code element@ parameter specifies which value to set from 0 to * @link ippGetCount(attr)@. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -3827,7 +3827,7 @@ ippSetDate(ipp_t *ipp, /* I - IPP message */ * (@code IPP_TAG_OPERATION@), printer (@code IPP_TAG_PRINTER@), subscription * (@code IPP_TAG_SUBSCRIPTION@), or unsupported (@code IPP_TAG_UNSUPPORTED_GROUP@). * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -3866,7 +3866,7 @@ ippSetGroupTag( * The @code element@ parameter specifies which value to set from 0 to * @link ippGetCount(attr)@. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -3906,7 +3906,7 @@ ippSetInteger(ipp_t *ipp, /* I - IPP message */ * * The @code attr@ parameter may be modified as a result of setting the value. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -3951,7 +3951,7 @@ ippSetName(ipp_t *ipp, /* I - IPP message */ * The @code element@ parameter specifies which value to set from 0 to * @link ippGetCount(attr)@. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ int /* O - 1 on success, 0 on failure */ @@ -4034,7 +4034,7 @@ ippSetOctetString( * The @code ipp@ parameter refers to an IPP message previously created using * the @link ippNew@, @link ippNewRequest@, or @link ippNewResponse@ functions. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -4069,7 +4069,7 @@ ippSetOperation(ipp_t *ipp, /* I - IPP request message */ * The @code element@ parameter specifies which value to set from 0 to * @link ippGetCount(attr)@. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -4112,7 +4112,7 @@ ippSetRange(ipp_t *ipp, /* I - IPP message */ * * The @code request_id@ parameter must be greater than 0. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -4149,7 +4149,7 @@ ippSetRequestId(ipp_t *ipp, /* I - IPP message */ * The @code element@ parameter specifies which value to set from 0 to * @link ippGetCount(attr)@. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -4191,7 +4191,7 @@ ippSetResolution( /* * 'ippSetState()' - Set the current state of the IPP message. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -4222,7 +4222,7 @@ ippSetState(ipp_t *ipp, /* I - IPP message */ * The @code ipp@ parameter refers to an IPP message previously created using * the @link ippNew@, @link ippNewRequest@, or @link ippNewResponse@ functions. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -4257,7 +4257,7 @@ ippSetStatusCode(ipp_t *ipp, /* I - IPP response or event message */ * The @code element@ parameter specifies which value to set from 0 to * @link ippGetCount(attr)@. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -4324,7 +4324,7 @@ ippSetString(ipp_t *ipp, /* I - IPP message */ * needed. The formatted string is truncated as needed to the maximum length of * the corresponding value type. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ int /* O - 1 on success, 0 on failure */ @@ -4362,7 +4362,7 @@ ippSetStringf(ipp_t *ipp, /* I - IPP message */ * needed. The formatted string is truncated as needed to the maximum length of * the corresponding value type. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ int /* O - 1 on success, 0 on failure */ @@ -4514,7 +4514,7 @@ ippSetStringfv(ipp_t *ipp, /* I - IPP message */ * code in the "attributes-natural-language" attribute or, if not present, the language * code for the current locale. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -4671,7 +4671,7 @@ ippSetValueTag( * * The valid version numbers are currently 1.0, 1.1, 2.0, 2.1, and 2.2. * - * @since CUPS 1.6/OS X 10.8@ + * @since CUPS 1.6/macOS 10.8@ */ int /* O - 1 on success, 0 on failure */ @@ -4752,7 +4752,7 @@ ippTimeToDate(time_t t) /* I - UNIX time value */ * value tag. 1 is returned if the attribute is valid, 0 otherwise. On * failure, cupsLastErrorString() is set to a human-readable message. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ int /* O - 1 if valid, 0 otherwise */ @@ -5391,7 +5391,7 @@ ippValidateAttribute( * attribute. Like @link ippValidateAttribute@, cupsLastErrorString() is set * to a human-readable message on failure. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ int /* O - 1 if valid, 0 otherwise */ @@ -5431,7 +5431,7 @@ ippWrite(http_t *http, /* I - HTTP connection */ /* * 'ippWriteFile()' - Write data for an IPP message to a file. * - * @since CUPS 1.1.19/OS X 10.3@ + * @since CUPS 1.1.19/macOS 10.3@ */ ipp_state_t /* O - Current state */ @@ -5449,7 +5449,7 @@ ippWriteFile(int fd, /* I - HTTP data */ /* * 'ippWriteIO()' - Write data for an IPP message. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ipp_state_t /* O - Current state */ diff --git a/cups/ipp.h b/cups/ipp.h index de509bc7d..01c961c00 100644 --- a/cups/ipp.h +++ b/cups/ipp.h @@ -262,13 +262,13 @@ typedef enum ipp_op_e /**** IPP operations ****/ IPP_OP_SET_PRINTER_ATTRIBUTES, /* Set printer attributes */ IPP_OP_SET_JOB_ATTRIBUTES, /* Set job attributes */ IPP_OP_GET_PRINTER_SUPPORTED_VALUES, /* Get supported attribute values */ - IPP_OP_CREATE_PRINTER_SUBSCRIPTIONS, /* Create one or more printer subscriptions @since CUPS 1.2/OS X 10.5@ */ - IPP_OP_CREATE_JOB_SUBSCRIPTIONS, /* Create one of more job subscriptions @since CUPS 1.2/OS X 10.5@ */ - IPP_OP_GET_SUBSCRIPTION_ATTRIBUTES, /* Get subscription attributes @since CUPS 1.2/OS X 10.5@ */ - IPP_OP_GET_SUBSCRIPTIONS, /* Get list of subscriptions @since CUPS 1.2/OS X 10.5@ */ - IPP_OP_RENEW_SUBSCRIPTION, /* Renew a printer subscription @since CUPS 1.2/OS X 10.5@ */ - IPP_OP_CANCEL_SUBSCRIPTION, /* Cancel a subscription @since CUPS 1.2/OS X 10.5@ */ - IPP_OP_GET_NOTIFICATIONS, /* Get notification events @since CUPS 1.2/OS X 10.5@ */ + IPP_OP_CREATE_PRINTER_SUBSCRIPTIONS, /* Create one or more printer subscriptions @since CUPS 1.2/macOS 10.5@ */ + IPP_OP_CREATE_JOB_SUBSCRIPTIONS, /* Create one of more job subscriptions @since CUPS 1.2/macOS 10.5@ */ + IPP_OP_GET_SUBSCRIPTION_ATTRIBUTES, /* Get subscription attributes @since CUPS 1.2/macOS 10.5@ */ + IPP_OP_GET_SUBSCRIPTIONS, /* Get list of subscriptions @since CUPS 1.2/macOS 10.5@ */ + IPP_OP_RENEW_SUBSCRIPTION, /* Renew a printer subscription @since CUPS 1.2/macOS 10.5@ */ + IPP_OP_CANCEL_SUBSCRIPTION, /* Cancel a subscription @since CUPS 1.2/macOS 10.5@ */ + IPP_OP_GET_NOTIFICATIONS, /* Get notification events @since CUPS 1.2/macOS 10.5@ */ IPP_OP_SEND_NOTIFICATIONS, /* Send notification events @private@ */ IPP_OP_GET_RESOURCE_ATTRIBUTES, /* Get resource attributes @private@ */ IPP_OP_GET_RESOURCE_DATA, /* Get resource data @private@ */ @@ -331,9 +331,9 @@ typedef enum ipp_op_e /**** IPP operations ****/ IPP_OP_CUPS_GET_DEVICES, /* Get a list of supported devices @deprecated@ */ IPP_OP_CUPS_GET_PPDS, /* Get a list of supported drivers @deprecated@ */ IPP_OP_CUPS_MOVE_JOB, /* Move a job to a different printer */ - IPP_OP_CUPS_AUTHENTICATE_JOB, /* Authenticate a job @since CUPS 1.2/OS X 10.5@ */ + IPP_OP_CUPS_AUTHENTICATE_JOB, /* Authenticate a job @since CUPS 1.2/macOS 10.5@ */ IPP_OP_CUPS_GET_PPD, /* Get a PPD file @deprecated@ */ - IPP_OP_CUPS_GET_DOCUMENT = 0x4027, /* Get a document file @since CUPS 1.4/OS X 10.6@ */ + IPP_OP_CUPS_GET_DOCUMENT = 0x4027, /* Get a document file @since CUPS 1.4/macOS 10.6@ */ IPP_OP_CUPS_CREATE_LOCAL_PRINTER /* Create a local (temporary) printer @since CUPS 2.2 */ # ifndef _CUPS_NO_DEPRECATED @@ -566,8 +566,8 @@ typedef enum ipp_status_e /**** IPP status codes ****/ /* These are internal and never sent over the wire... */ IPP_STATUS_ERROR_CUPS_AUTHENTICATION_CANCELED = 0x1000, - /* cups-authentication-canceled - Authentication canceled by user @since CUPS 1.5/OS X 10.7@ */ - IPP_STATUS_ERROR_CUPS_PKI, /* cups-pki-error - Error negotiating a secure connection @since CUPS 1.5/OS X 10.7@ */ + /* cups-authentication-canceled - Authentication canceled by user @since CUPS 1.5/macOS 10.7@ */ + IPP_STATUS_ERROR_CUPS_PKI, /* cups-pki-error - Error negotiating a secure connection @since CUPS 1.5/macOS 10.7@ */ IPP_STATUS_ERROR_CUPS_UPGRADE_REQUIRED/* cups-upgrade-required - TLS upgrade required */ # ifndef _CUPS_NO_DEPRECATED @@ -687,21 +687,21 @@ typedef struct _ipp_s ipp_t; /**** IPP request/response data ****/ typedef struct _ipp_attribute_s ipp_attribute_t; /**** IPP attribute ****/ -/**** New in CUPS 1.2/OS X 10.5 ****/ +/**** New in CUPS 1.2/macOS 10.5 ****/ typedef ssize_t (*ipp_iocb_t)(void *context, ipp_uchar_t *buffer, size_t bytes); - /**** IPP IO Callback Function @since CUPS 1.2/OS X 10.5@ ****/ + /**** IPP IO Callback Function @since CUPS 1.2/macOS 10.5@ ****/ -/**** New in CUPS 1.6/OS X 10.8 ****/ +/**** New in CUPS 1.6/macOS 10.8 ****/ typedef int (*ipp_copycb_t)(void *context, ipp_t *dst, ipp_attribute_t *attr); /* - * The following structures are PRIVATE starting with CUPS 1.6/OS X 10.8. + * The following structures are PRIVATE starting with CUPS 1.6/macOS 10.8. * Please use the new accessor functions available in CUPS 1.6 and later, as * these definitions will be moved to a private header file in a future release. * * Define _IPP_PRIVATE_STRUCTURES to 1 to cause the private IPP structures to be - * exposed in CUPS 1.6. This happens automatically on OS X when compiling for + * exposed in CUPS 1.6. This happens automatically on macOS when compiling for * a deployment target of 10.7 or earlier. * * Define _IPP_PRIVATE_STRUCTURES to 0 to prevent the private IPP structures @@ -751,7 +751,7 @@ typedef union _ipp_request_u /**** Request Header ****/ } status; /**** New in CUPS 1.1.19 ****/ - struct /* Event Header @since CUPS 1.1.19/OS X 10.3@ */ + struct /* Event Header @since CUPS 1.1.19/macOS 10.3@ */ { ipp_uchar_t version[2]; /* Protocol version number */ ipp_status_t status_code; /* Status code */ @@ -795,7 +795,7 @@ typedef union _ipp_value_u /**** Attribute Value ****/ } unknown; /* Unknown attribute type */ /**** New in CUPS 1.1.19 ****/ - ipp_t *collection; /* Collection value @since CUPS 1.1.19/OS X 10.3@ */ + ipp_t *collection; /* Collection value @since CUPS 1.1.19/macOS 10.3@ */ } _ipp_value_t; typedef _ipp_value_t ipp_value_t; /**** Convenience typedef that will be removed @private@ ****/ @@ -819,10 +819,10 @@ struct _ipp_s /**** IPP Request/Response/Notification ****/ ipp_tag_t curtag; /* Current attribute group tag */ /**** New in CUPS 1.2 ****/ - ipp_attribute_t *prev; /* Previous attribute (for read) @since CUPS 1.2/OS X 10.5@ */ + ipp_attribute_t *prev; /* Previous attribute (for read) @since CUPS 1.2/macOS 10.5@ */ /**** New in CUPS 1.4.4 ****/ - int use; /* Use count @since CUPS 1.4.4/OS X 10.6.?@ */ + int use; /* Use count @since CUPS 1.4.4/macOS 10.6.?@ */ /**** New in CUPS 2.0 ****/ int atend, /* At end of list? */ curindex; /* Current attribute index for hierarchical search */ @@ -892,7 +892,7 @@ extern void ippDeleteAttribute(ipp_t *ipp, ipp_attribute_t *attr) _CUPS_API_1_1 extern ipp_state_t ippReadFile(int fd, ipp_t *ipp) _CUPS_API_1_1_19; extern ipp_state_t ippWriteFile(int fd, ipp_t *ipp) _CUPS_API_1_1_19; -/**** New in CUPS 1.2/OS X 10.5 ****/ +/**** New in CUPS 1.2/macOS 10.5 ****/ extern ipp_attribute_t *ippAddOctetString(ipp_t *ipp, ipp_tag_t group, const char *name, const void *data, int datalen) _CUPS_API_1_2; @@ -905,11 +905,11 @@ extern ipp_state_t ippReadIO(void *src, ipp_iocb_t cb, int blocking, extern ipp_state_t ippWriteIO(void *dst, ipp_iocb_t cb, int blocking, ipp_t *parent, ipp_t *ipp) _CUPS_API_1_2; -/**** New in CUPS 1.4/OS X 10.6 ****/ +/**** New in CUPS 1.4/macOS 10.6 ****/ extern const char *ippTagString(ipp_tag_t tag) _CUPS_API_1_4; extern ipp_tag_t ippTagValue(const char *name) _CUPS_API_1_4; -/**** New in CUPS 1.6/OS X 10.8 ****/ +/**** New in CUPS 1.6/macOS 10.8 ****/ extern ipp_attribute_t *ippAddOutOfBand(ipp_t *ipp, ipp_tag_t group, ipp_tag_t value_tag, const char *name) _CUPS_API_1_6; diff --git a/cups/notify.c b/cups/notify.c index cb005497d..5f6e7fd54 100644 --- a/cups/notify.c +++ b/cups/notify.c @@ -25,7 +25,7 @@ * * The returned string must be freed by the caller using @code free@. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ char * /* O - Subject string or @code NULL@ */ @@ -156,7 +156,7 @@ cupsNotifySubject(cups_lang_t *lang, /* I - Language data */ * * The returned string must be freed by the caller using @code free@. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ char * /* O - Message text or @code NULL@ */ diff --git a/cups/options.c b/cups/options.c index 986ae1ca2..a3f57cfc0 100644 --- a/cups/options.c +++ b/cups/options.c @@ -419,7 +419,7 @@ cupsParseOptions( /* * 'cupsRemoveOption()' - Remove an option from an option array. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - New number of options */ diff --git a/cups/ppd-attr.c b/cups/ppd-attr.c index 4a57d09ff..6324e6e15 100644 --- a/cups/ppd-attr.c +++ b/cups/ppd-attr.c @@ -22,7 +22,7 @@ /* * 'ppdFindAttr()' - Find the first matching attribute. * - * @since CUPS 1.1.19/OS X 10.3@ + * @since CUPS 1.1.19/macOS 10.3@ */ ppd_attr_t * /* O - Attribute or @code NULL@ if not found */ @@ -79,7 +79,7 @@ ppdFindAttr(ppd_file_t *ppd, /* I - PPD file data */ /* * 'ppdFindNextAttr()' - Find the next matching attribute. * - * @since CUPS 1.1.19/OS X 10.3@ + * @since CUPS 1.1.19/macOS 10.3@ */ ppd_attr_t * /* O - Attribute or @code NULL@ if not found */ diff --git a/cups/ppd-conflicts.c b/cups/ppd-conflicts.c index 26e104e92..68e03b4dc 100644 --- a/cups/ppd-conflicts.c +++ b/cups/ppd-conflicts.c @@ -63,7 +63,7 @@ static cups_array_t *ppd_test_constraints(ppd_file_t *ppd, * the conflicting options. The returned option array must be freed using * @link cupsFreeOptions@. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ int /* O - Number of conflicting options */ @@ -162,7 +162,7 @@ cupsGetConflicts( * choice for the conflicting option, then iterating over all possible choices * until a non-conflicting option choice is found. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ int /* O - 1 on success, 0 on failure */ @@ -634,7 +634,7 @@ ppdConflicts(ppd_file_t *ppd) /* I - PPD to check */ * This function tests whether a particular option choice is available based * on constraints against options in the "InstallableOptions" group. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ int /* O - 1 if conflicting, 0 if not conflicting */ diff --git a/cups/ppd-custom.c b/cups/ppd-custom.c index 25516b607..6e4d3bd6e 100644 --- a/cups/ppd-custom.c +++ b/cups/ppd-custom.c @@ -33,7 +33,7 @@ /* * 'ppdFindCustomOption()' - Find a custom option. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ppd_coption_t * /* O - Custom option or NULL */ @@ -54,7 +54,7 @@ ppdFindCustomOption(ppd_file_t *ppd, /* I - PPD file */ /* * 'ppdFindCustomParam()' - Find a parameter for a custom option. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ppd_cparam_t * /* O - Custom parameter or NULL */ @@ -80,7 +80,7 @@ ppdFindCustomParam(ppd_coption_t *opt, /* I - Custom option */ /* * 'ppdFirstCustomParam()' - Return the first parameter for a custom option. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ppd_cparam_t * /* O - Custom parameter or NULL */ @@ -96,7 +96,7 @@ ppdFirstCustomParam(ppd_coption_t *opt) /* I - Custom option */ /* * 'ppdNextCustomParam()' - Return the next parameter for a custom option. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ppd_cparam_t * /* O - Custom parameter or NULL */ diff --git a/cups/ppd-emit.c b/cups/ppd-emit.c index 1c3d32005..0b4f1c995 100644 --- a/cups/ppd-emit.c +++ b/cups/ppd-emit.c @@ -69,7 +69,7 @@ ppdCollect(ppd_file_t *ppd, /* I - PPD file data */ * The choices array should be freed using @code free@ when you are * finished with it. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - Number of options marked */ @@ -242,7 +242,7 @@ ppdEmit(ppd_file_t *ppd, /* I - PPD file record */ * * When "limit" is zero, this function is identical to ppdEmit(). * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 0 on success, -1 on failure */ @@ -536,7 +536,7 @@ ppdEmitJCL(ppd_file_t *ppd, /* I - PPD file record */ /* * 'ppdEmitJCLEnd()' - Emit JCLEnd code to a file. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 0 on success, -1 on failure */ @@ -595,7 +595,7 @@ ppdEmitJCLEnd(ppd_file_t *ppd, /* I - PPD file record */ * The return string is allocated on the heap and should be freed using * @code free@ when you are done with it. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ char * /* O - String containing option code or @code NULL@ if there is no option code */ diff --git a/cups/ppd-localize.c b/cups/ppd-localize.c index c20dbf937..db9317090 100644 --- a/cups/ppd-localize.c +++ b/cups/ppd-localize.c @@ -44,7 +44,7 @@ static cups_lang_t *ppd_ll_CC(char *ll_CC, size_t ll_CC_size); * descriptions, printer presets, and custom option parameters. Each * localized string uses the UTF-8 character encoding. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ int /* O - 0 on success, -1 on error */ @@ -229,7 +229,7 @@ ppdLocalizeAttr(ppd_file_t *ppd, /* I - PPD file */ * * If no value of the requested scheme can be found, NULL is returned. * - * @since CUPS 1.3/OS X 10.5@ + * @since CUPS 1.3/macOS 10.5@ */ const char * /* O - Value or NULL if not found */ @@ -482,7 +482,7 @@ ppdLocalizeIPPReason( * text from the attribute value. If no localized text for the requested * name can be found, @code NULL@ is returned. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ const char * /* O - Value or @code NULL@ if not found */ @@ -620,7 +620,7 @@ _ppdGetLanguages(ppd_file_t *ppd) /* I - PPD file */ /* * '_ppdHashName()' - Generate a hash value for a device or profile name. * - * This function is primarily used on OS X, but is generally accessible + * This function is primarily used on macOS, but is generally accessible * since cupstestppd needs to check for profile name collisions in PPD files... */ diff --git a/cups/ppd-mark.c b/cups/ppd-mark.c index 3b0c51306..6faf62789 100644 --- a/cups/ppd-mark.c +++ b/cups/ppd-mark.c @@ -113,7 +113,7 @@ cupsMarkOptions( * InputSlot, etc.) is not also set. * * For PageSize, we also check for an empty option value since some versions - * of MacOS X use it to specify auto-selection of the media based solely on + * of MacmacOS use it to specify auto-selection of the media based solely on * the size. */ @@ -561,7 +561,7 @@ ppdMarkOption(ppd_file_t *ppd, /* I - PPD file record */ * * Options are returned from all groups in ascending alphanumeric order. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ppd_option_t * /* O - First option or @code NULL@ */ @@ -579,7 +579,7 @@ ppdFirstOption(ppd_file_t *ppd) /* I - PPD file */ * * Options are returned from all groups in ascending alphanumeric order. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ppd_option_t * /* O - Next option or @code NULL@ */ @@ -770,7 +770,7 @@ ppd_mark_option(ppd_file_t *ppd, /* I - PPD file */ ppd, option, choice)); /* - * AP_D_InputSlot is the "default input slot" on MacOS X, and setting + * AP_D_InputSlot is the "default input slot" on MacmacOS, and setting * it clears the regular InputSlot choices... */ diff --git a/cups/ppd-page.c b/cups/ppd-page.c index 246907017..f18e68d0d 100644 --- a/cups/ppd-page.c +++ b/cups/ppd-page.c @@ -189,7 +189,7 @@ ppdPageSize(ppd_file_t *ppd, /* I - PPD file record */ * If the specified PPD file does not support custom page sizes, both * "minimum" and "maximum" are filled with zeroes. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ int /* O - 1 if custom sizes are supported, 0 otherwise */ diff --git a/cups/ppd-util.c b/cups/ppd-util.c index 527549164..af5bd2004 100644 --- a/cups/ppd-util.c +++ b/cups/ppd-util.c @@ -80,7 +80,7 @@ cupsGetPPD(const char *name) /* I - Destination name */ * each call to @link cupsGetPPD@ or @code cupsGetPPD2@. The caller "owns" the * file that is created and must @code unlink@ the returned filename. * - * @since CUPS 1.1.21/OS X 10.4@ + * @since CUPS 1.1.21/macOS 10.4@ */ const char * /* O - Filename for PPD file */ @@ -121,7 +121,7 @@ cupsGetPPD2(http_t *http, /* I - Connection to server or @code CUPS_HTTP_DE * For classes, @code cupsGetPPD3@ returns the PPD file for the first printer * in the class. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ http_status_t /* O - HTTP status */ @@ -429,7 +429,7 @@ cupsGetPPD3(http_t *http, /* I - HTTP connection or @code CUPS_HTTP_DEFAUL * overwritten on the next call to @link cupsGetPPD@, @link cupsGetPPD2@, * or @link cupsGetServerPPD@. * - * @since CUPS 1.3/OS X 10.5@ + * @since CUPS 1.3/macOS 10.5@ */ char * /* O - Name of PPD file or @code NULL@ on error */ diff --git a/cups/ppd.c b/cups/ppd.c index 7721b74fa..44a22c5cb 100644 --- a/cups/ppd.c +++ b/cups/ppd.c @@ -302,7 +302,7 @@ ppdClose(ppd_file_t *ppd) /* I - PPD file record */ /* * 'ppdErrorString()' - Returns the text associated with a status. * - * @since CUPS 1.1.19/OS X 10.3@ + * @since CUPS 1.1.19/macOS 10.3@ */ const char * /* O - Status string */ @@ -412,7 +412,7 @@ _ppdGlobals(void) /* * 'ppdLastError()' - Return the status from the last ppdOpen*(). * - * @since CUPS 1.1.19/OS X 10.3@ + * @since CUPS 1.1.19/macOS 10.3@ */ ppd_status_t /* O - Status code */ @@ -432,7 +432,7 @@ ppdLastError(int *line) /* O - Line number */ /* * '_ppdOpen()' - Read a PPD file into memory. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ppd_file_t * /* O - PPD file record or @code NULL@ if the PPD file could not be opened. */ @@ -2128,7 +2128,7 @@ ppdOpen(FILE *fp) /* I - File to read from */ /* * 'ppdOpen2()' - Read a PPD file into memory. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ ppd_file_t * /* O - PPD file record or @code NULL@ if the PPD file could not be opened. */ @@ -2253,7 +2253,7 @@ ppdOpenFile(const char *filename) /* I - File to read from */ /* * 'ppdSetConformance()' - Set the conformance level for PPD files. * - * @since CUPS 1.1.20/OS X 10.4@ + * @since CUPS 1.1.20/macOS 10.4@ */ void @@ -3122,7 +3122,7 @@ ppd_read(cups_file_t *fp, /* I - File to read from */ DEBUG_printf(("9ppd_read: LINE=\"%s\"", line->buffer)); /* - * The dynamically created PPDs for older style OS X + * The dynamically created PPDs for older style macOS * drivers include a large blob of data inserted as comments * at the end of the file. As an optimization we can stop * reading the PPD when we get to the start of this data. diff --git a/cups/ppd.h b/cups/ppd.h index a95dac17f..eb9ab382b 100644 --- a/cups/ppd.h +++ b/cups/ppd.h @@ -106,7 +106,7 @@ typedef enum ppd_cs_e /**** Colorspaces ****/ PPD_CS_N /* DeviceN colorspace */ } ppd_cs_t; -typedef enum ppd_status_e /**** Status Codes @since CUPS 1.1.19/OS X 10.3@ ****/ +typedef enum ppd_status_e /**** Status Codes @since CUPS 1.1.19/macOS 10.3@ ****/ { PPD_OK = 0, /* OK */ PPD_FILE_OPEN_ERROR, /* Unable to open PPD file */ @@ -135,16 +135,16 @@ typedef enum ppd_status_e /**** Status Codes @since CUPS 1.1.19/OS X 10.3@ **** PPD_MAX_STATUS /* @private@ */ } ppd_status_t; -enum ppd_conform_e /**** Conformance Levels @since CUPS 1.1.19/OS X 10.3@ ****/ +enum ppd_conform_e /**** Conformance Levels @since CUPS 1.1.19/macOS 10.3@ ****/ { PPD_CONFORM_RELAXED, /* Relax whitespace and control char */ PPD_CONFORM_STRICT /* Require strict conformance */ }; typedef enum ppd_conform_e ppd_conform_t; - /**** Conformance Levels @since CUPS 1.1.19/OS X 10.3@ ****/ + /**** Conformance Levels @since CUPS 1.1.19/macOS 10.3@ ****/ -typedef struct ppd_attr_s /**** PPD Attribute Structure @since CUPS 1.1.19/OS X 10.3@ ****/ +typedef struct ppd_attr_s /**** PPD Attribute Structure @since CUPS 1.1.19/macOS 10.3@ ****/ { char name[PPD_MAX_NAME]; /* Name of attribute (cupsXYZ) */ char spec[PPD_MAX_NAME]; /* Specifier string, if any */ @@ -185,7 +185,7 @@ typedef struct ppd_group_s /**** Groups ****/ ****/ char text[PPD_MAX_TEXT - PPD_MAX_NAME]; /* Human-readable group name */ - char name[PPD_MAX_NAME]; /* Group name @since CUPS 1.1.18/OS X 10.3@ */ + char name[PPD_MAX_NAME]; /* Group name @since CUPS 1.1.18/macOS 10.3@ */ int num_options; /* Number of options */ ppd_option_t *options; /* Options */ int num_subgroups; /* Number of sub-groups */ @@ -230,8 +230,8 @@ typedef struct ppd_profile_s /**** sRGB Color Profiles ****/ float matrix[3][3]; /* Transform matrix */ } ppd_profile_t; -/**** New in CUPS 1.2/OS X 10.5 ****/ -typedef enum ppd_cptype_e /**** Custom Parameter Type @since CUPS 1.2/OS X 10.5@ ****/ +/**** New in CUPS 1.2/macOS 10.5 ****/ +typedef enum ppd_cptype_e /**** Custom Parameter Type @since CUPS 1.2/macOS 10.5@ ****/ { PPD_CUSTOM_CURVE, /* Curve value for f(x) = x^value */ PPD_CUSTOM_INT, /* Integer number value */ @@ -243,7 +243,7 @@ typedef enum ppd_cptype_e /**** Custom Parameter Type @since CUPS 1.2/OS X 10.5 PPD_CUSTOM_STRING /* String of characters */ } ppd_cptype_t; -typedef union ppd_cplimit_u /**** Custom Parameter Limit @since CUPS 1.2/OS X 10.5@ ****/ +typedef union ppd_cplimit_u /**** Custom Parameter Limit @since CUPS 1.2/macOS 10.5@ ****/ { float custom_curve; /* Gamma value */ int custom_int; /* Integer value */ @@ -255,7 +255,7 @@ typedef union ppd_cplimit_u /**** Custom Parameter Limit @since CUPS 1.2/OS X 1 int custom_string; /* String length */ } ppd_cplimit_t; -typedef union ppd_cpvalue_u /**** Custom Parameter Value @since CUPS 1.2/OS X 10.5@ ****/ +typedef union ppd_cpvalue_u /**** Custom Parameter Value @since CUPS 1.2/macOS 10.5@ ****/ { float custom_curve; /* Gamma value */ int custom_int; /* Integer value */ @@ -267,7 +267,7 @@ typedef union ppd_cpvalue_u /**** Custom Parameter Value @since CUPS 1.2/OS X 1 char *custom_string; /* String value */ } ppd_cpvalue_t; -typedef struct ppd_cparam_s /**** Custom Parameter @since CUPS 1.2/OS X 10.5@ ****/ +typedef struct ppd_cparam_s /**** Custom Parameter @since CUPS 1.2/macOS 10.5@ ****/ { char name[PPD_MAX_NAME]; /* Parameter name */ char text[PPD_MAX_TEXT]; /* Human-readable text */ @@ -278,7 +278,7 @@ typedef struct ppd_cparam_s /**** Custom Parameter @since CUPS 1.2/OS X 10.5@ * ppd_cpvalue_t current; /* Current value */ } ppd_cparam_t; -typedef struct ppd_coption_s /**** Custom Option @since CUPS 1.2/OS X 10.5@ ****/ +typedef struct ppd_coption_s /**** Custom Option @since CUPS 1.2/macOS 10.5@ ****/ { char keyword[PPD_MAX_NAME]; /* Name of option that is being extended... */ ppd_option_t *option; /* Option that is being extended... */ @@ -287,7 +287,7 @@ typedef struct ppd_coption_s /**** Custom Option @since CUPS 1.2/OS X 10.5@ *** } ppd_coption_t; typedef struct _ppd_cache_s _ppd_cache_t; - /**** PPD cache and mapping data @since CUPS 1.5/OS X 10.7@ @private@ ****/ + /**** PPD cache and mapping data @since CUPS 1.5/macOS 10.7@ @private@ ****/ typedef struct ppd_file_s /**** PPD File ****/ { @@ -335,25 +335,25 @@ typedef struct ppd_file_s /**** PPD File ****/ int flip_duplex; /* 1 = Flip page for back sides @deprecated@ */ /**** New in CUPS 1.1.19 ****/ - char *protocols; /* Protocols (BCP, TBCP) string @since CUPS 1.1.19/OS X 10.3@ */ - char *pcfilename; /* PCFileName string @since CUPS 1.1.19/OS X 10.3@ */ - int num_attrs; /* Number of attributes @since CUPS 1.1.19/OS X 10.3@ @private@ */ - int cur_attr; /* Current attribute @since CUPS 1.1.19/OS X 10.3@ @private@ */ - ppd_attr_t **attrs; /* Attributes @since CUPS 1.1.19/OS X 10.3@ @private@ */ + char *protocols; /* Protocols (BCP, TBCP) string @since CUPS 1.1.19/macOS 10.3@ */ + char *pcfilename; /* PCFileName string @since CUPS 1.1.19/macOS 10.3@ */ + int num_attrs; /* Number of attributes @since CUPS 1.1.19/macOS 10.3@ @private@ */ + int cur_attr; /* Current attribute @since CUPS 1.1.19/macOS 10.3@ @private@ */ + ppd_attr_t **attrs; /* Attributes @since CUPS 1.1.19/macOS 10.3@ @private@ */ - /**** New in CUPS 1.2/OS X 10.5 ****/ - cups_array_t *sorted_attrs; /* Attribute lookup array @since CUPS 1.2/OS X 10.5@ @private@ */ - cups_array_t *options; /* Option lookup array @since CUPS 1.2/OS X 10.5@ @private@ */ - cups_array_t *coptions; /* Custom options array @since CUPS 1.2/OS X 10.5@ @private@ */ + /**** New in CUPS 1.2/macOS 10.5 ****/ + cups_array_t *sorted_attrs; /* Attribute lookup array @since CUPS 1.2/macOS 10.5@ @private@ */ + cups_array_t *options; /* Option lookup array @since CUPS 1.2/macOS 10.5@ @private@ */ + cups_array_t *coptions; /* Custom options array @since CUPS 1.2/macOS 10.5@ @private@ */ - /**** New in CUPS 1.3/OS X 10.5 ****/ - cups_array_t *marked; /* Marked choices @since CUPS 1.3/OS X 10.5@ @private@ */ + /**** New in CUPS 1.3/macOS 10.5 ****/ + cups_array_t *marked; /* Marked choices @since CUPS 1.3/macOS 10.5@ @private@ */ - /**** New in CUPS 1.4/OS X 10.6 ****/ - cups_array_t *cups_uiconstraints; /* cupsUIConstraints @since CUPS 1.4/OS X 10.6@ @private@ */ + /**** New in CUPS 1.4/macOS 10.6 ****/ + cups_array_t *cups_uiconstraints; /* cupsUIConstraints @since CUPS 1.4/macOS 10.6@ @private@ */ /**** New in CUPS 1.5 ****/ - _ppd_cache_t *cache; /* PPD cache and mapping data @since CUPS 1.5/OS X 10.7@ @private@ */ + _ppd_cache_t *cache; /* PPD cache and mapping data @since CUPS 1.5/macOS 10.7@ @private@ */ } ppd_file_t; @@ -440,14 +440,14 @@ extern ppd_option_t *ppdNextOption(ppd_file_t *ppd) _PPD_DEPRECATED; extern int ppdLocalize(ppd_file_t *ppd) _PPD_DEPRECATED; extern ppd_file_t *ppdOpen2(cups_file_t *fp) _PPD_DEPRECATED; -/**** New in CUPS 1.3/OS X 10.5 ****/ +/**** New in CUPS 1.3/macOS 10.5 ****/ extern const char *ppdLocalizeIPPReason(ppd_file_t *ppd, const char *reason, const char *scheme, char *buffer, size_t bufsize) _PPD_DEPRECATED; -/**** New in CUPS 1.4/OS X 10.6 ****/ +/**** New in CUPS 1.4/macOS 10.6 ****/ extern int cupsGetConflicts(ppd_file_t *ppd, const char *option, const char *choice, cups_option_t **options) diff --git a/cups/pwg-media.c b/cups/pwg-media.c index 1f3961efa..6a206877e 100644 --- a/cups/pwg-media.c +++ b/cups/pwg-media.c @@ -258,7 +258,7 @@ static pwg_media_t const cups_pwg_media[] = * units string is @code NULL@, otherwise inches ("in") or millimeters ("mm") * are used. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ int /* O - 1 on success, 0 on failure */ @@ -378,7 +378,7 @@ pwgFormatSizeName(char *keyword, /* I - Keyword buffer */ return (1); } -/* For OS X 10.8 and earlier... */ +/* For macOS 10.8 and earlier... */ void _pwgGenerateSize(char *keyword, size_t keysize, const char *prefix, const char *name, int width, int length) { pwgFormatSizeName(keyword, keysize, prefix, name, width, length, NULL); } @@ -396,7 +396,7 @@ void _pwgGenerateSize(char *keyword, size_t keysize, const char *prefix, * member attribute was specified in the "media-col" Job Template attribute, * otherwise it is initialized to 0. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ int /* O - 1 if size was initialized, 0 otherwise */ @@ -560,7 +560,7 @@ pwgInitSize(pwg_size_t *size, /* I - Size to initialize */ return (1); } -/* For OS X 10.8 and earlier */ +/* For macOS 10.8 and earlier */ int _pwgInitSize(pwg_size_t *size, ipp_t *job, int *margins_set) { return (pwgInitSize(size, job, margins_set)); } @@ -571,7 +571,7 @@ int _pwgInitSize(pwg_size_t *size, ipp_t *job, int *margins_set) * The "name" argument specifies the legacy ISO media size name, for example * "iso-a4" or "na-letter". * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ pwg_media_t * /* O - Matching size or NULL */ @@ -629,7 +629,7 @@ pwgMediaForLegacy(const char *legacy) /* I - Legacy size name */ * thread. Custom names can be of the form "Custom.WIDTHxLENGTH[units]" or * "WIDTHxLENGTH[units]". * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ pwg_media_t * /* O - Matching size or NULL */ @@ -797,7 +797,7 @@ pwgMediaForPPD(const char *ppd) /* I - PPD size name */ * thread-local storage and is overwritten by each call to the function in the * thread. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ pwg_media_t * /* O - Matching size or NULL */ @@ -896,7 +896,7 @@ pwgMediaForPWG(const char *pwg) /* I - PWG size name */ * thread-local storage and is overwritten by each call to the function in the * thread. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ pwg_media_t * /* O - PWG media name */ diff --git a/cups/raster.h b/cups/raster.h index cfd5be729..4a853448c 100644 --- a/cups/raster.h +++ b/cups/raster.h @@ -132,28 +132,28 @@ typedef enum cups_cspace_e /**** cupsColorSpace attribute values ****/ CUPS_CSPACE_GOLD = 13, /* Gold foil @deprecated@ */ CUPS_CSPACE_SILVER = 14, /* Silver foil @deprecated@ */ - CUPS_CSPACE_CIEXYZ = 15, /* CIE XYZ @since CUPS 1.1.19/OS X 10.3@ */ - CUPS_CSPACE_CIELab = 16, /* CIE Lab @since CUPS 1.1.19/OS X 10.3@ */ - CUPS_CSPACE_RGBW = 17, /* Red, green, blue, white (DeviceRGB, sRGB by default) @since CUPS 1.2/OS X 10.5@ */ + CUPS_CSPACE_CIEXYZ = 15, /* CIE XYZ @since CUPS 1.1.19/macOS 10.3@ */ + CUPS_CSPACE_CIELab = 16, /* CIE Lab @since CUPS 1.1.19/macOS 10.3@ */ + CUPS_CSPACE_RGBW = 17, /* Red, green, blue, white (DeviceRGB, sRGB by default) @since CUPS 1.2/macOS 10.5@ */ CUPS_CSPACE_SW = 18, /* Luminance (gamma 2.2) @since CUPS 1.4.5@ */ CUPS_CSPACE_SRGB = 19, /* Red, green, blue (sRGB) @since CUPS 1.4.5@ */ CUPS_CSPACE_ADOBERGB = 20, /* Red, green, blue (Adobe RGB) @since CUPS 1.4.5@ */ - CUPS_CSPACE_ICC1 = 32, /* ICC-based, 1 color @since CUPS 1.1.19/OS X 10.3@ */ - CUPS_CSPACE_ICC2 = 33, /* ICC-based, 2 colors @since CUPS 1.1.19/OS X 10.3@ */ - CUPS_CSPACE_ICC3 = 34, /* ICC-based, 3 colors @since CUPS 1.1.19/OS X 10.3@ */ - CUPS_CSPACE_ICC4 = 35, /* ICC-based, 4 colors @since CUPS 1.1.19/OS X 10.3@ */ - CUPS_CSPACE_ICC5 = 36, /* ICC-based, 5 colors @since CUPS 1.1.19/OS X 10.3@ */ - CUPS_CSPACE_ICC6 = 37, /* ICC-based, 6 colors @since CUPS 1.1.19/OS X 10.3@ */ - CUPS_CSPACE_ICC7 = 38, /* ICC-based, 7 colors @since CUPS 1.1.19/OS X 10.3@ */ - CUPS_CSPACE_ICC8 = 39, /* ICC-based, 8 colors @since CUPS 1.1.19/OS X 10.3@ */ - CUPS_CSPACE_ICC9 = 40, /* ICC-based, 9 colors @since CUPS 1.1.19/OS X 10.3@ */ - CUPS_CSPACE_ICCA = 41, /* ICC-based, 10 colors @since CUPS 1.1.19/OS X 10.3@ */ - CUPS_CSPACE_ICCB = 42, /* ICC-based, 11 colors @since CUPS 1.1.19/OS X 10.3@ */ - CUPS_CSPACE_ICCC = 43, /* ICC-based, 12 colors @since CUPS 1.1.19/OS X 10.3@ */ - CUPS_CSPACE_ICCD = 44, /* ICC-based, 13 colors @since CUPS 1.1.19/OS X 10.3@ */ - CUPS_CSPACE_ICCE = 45, /* ICC-based, 14 colors @since CUPS 1.1.19/OS X 10.3@ */ - CUPS_CSPACE_ICCF = 46, /* ICC-based, 15 colors @since CUPS 1.1.19/OS X 10.3@ */ + CUPS_CSPACE_ICC1 = 32, /* ICC-based, 1 color @since CUPS 1.1.19/macOS 10.3@ */ + CUPS_CSPACE_ICC2 = 33, /* ICC-based, 2 colors @since CUPS 1.1.19/macOS 10.3@ */ + CUPS_CSPACE_ICC3 = 34, /* ICC-based, 3 colors @since CUPS 1.1.19/macOS 10.3@ */ + CUPS_CSPACE_ICC4 = 35, /* ICC-based, 4 colors @since CUPS 1.1.19/macOS 10.3@ */ + CUPS_CSPACE_ICC5 = 36, /* ICC-based, 5 colors @since CUPS 1.1.19/macOS 10.3@ */ + CUPS_CSPACE_ICC6 = 37, /* ICC-based, 6 colors @since CUPS 1.1.19/macOS 10.3@ */ + CUPS_CSPACE_ICC7 = 38, /* ICC-based, 7 colors @since CUPS 1.1.19/macOS 10.3@ */ + CUPS_CSPACE_ICC8 = 39, /* ICC-based, 8 colors @since CUPS 1.1.19/macOS 10.3@ */ + CUPS_CSPACE_ICC9 = 40, /* ICC-based, 9 colors @since CUPS 1.1.19/macOS 10.3@ */ + CUPS_CSPACE_ICCA = 41, /* ICC-based, 10 colors @since CUPS 1.1.19/macOS 10.3@ */ + CUPS_CSPACE_ICCB = 42, /* ICC-based, 11 colors @since CUPS 1.1.19/macOS 10.3@ */ + CUPS_CSPACE_ICCC = 43, /* ICC-based, 12 colors @since CUPS 1.1.19/macOS 10.3@ */ + CUPS_CSPACE_ICCD = 44, /* ICC-based, 13 colors @since CUPS 1.1.19/macOS 10.3@ */ + CUPS_CSPACE_ICCE = 45, /* ICC-based, 14 colors @since CUPS 1.1.19/macOS 10.3@ */ + CUPS_CSPACE_ICCF = 46, /* ICC-based, 15 colors @since CUPS 1.1.19/macOS 10.3@ */ CUPS_CSPACE_DEVICE1 = 48, /* DeviceN, 1 color @since CUPS 1.4.5@ */ CUPS_CSPACE_DEVICE2 = 49, /* DeviceN, 2 colors @since CUPS 1.4.5@ */ @@ -201,8 +201,8 @@ enum cups_mode_e /**** cupsRasterOpen modes ****/ { CUPS_RASTER_READ = 0, /* Open stream for reading */ CUPS_RASTER_WRITE = 1, /* Open stream for writing */ - CUPS_RASTER_WRITE_COMPRESSED = 2, /* Open stream for compressed writing @since CUPS 1.3/OS X 10.5@ */ - CUPS_RASTER_WRITE_PWG = 3 /* Open stream for compressed writing in PWG mode @since CUPS 1.5/OS X 10.7@ */ + CUPS_RASTER_WRITE_COMPRESSED = 2, /* Open stream for compressed writing @since CUPS 1.3/macOS 10.5@ */ + CUPS_RASTER_WRITE_PWG = 3 /* Open stream for compressed writing in PWG mode @since CUPS 1.5/macOS 10.7@ */ }; typedef enum cups_mode_e cups_mode_t; /**** cupsRasterOpen modes ****/ @@ -281,7 +281,7 @@ typedef struct cups_page_header_s /**** Version 1 page header @deprecated@ ****/ } cups_page_header_t; /**** New in CUPS 1.2 ****/ -typedef struct cups_page_header2_s /**** Version 2 page header @since CUPS 1.2/OS X 10.5@ ****/ +typedef struct cups_page_header2_s /**** Version 2 page header @since CUPS 1.2/macOS 10.5@ ****/ { /**** Standard Page Device Dictionary String Values ****/ char MediaClass[64]; /* MediaClass string */ @@ -329,20 +329,20 @@ typedef struct cups_page_header2_s /**** Version 2 page header @since CUPS 1.2/O unsigned cupsRowStep; /* Spacing between lines */ /**** Version 2 Dictionary Values ****/ - unsigned cupsNumColors; /* Number of color compoents @since CUPS 1.2/OS X 10.5@ */ + unsigned cupsNumColors; /* Number of color compoents @since CUPS 1.2/macOS 10.5@ */ float cupsBorderlessScalingFactor; - /* Scaling that was applied to page data @since CUPS 1.2/OS X 10.5@ */ + /* Scaling that was applied to page data @since CUPS 1.2/macOS 10.5@ */ float cupsPageSize[2]; /* Floating point PageSize (scaling * - * factor not applied) @since CUPS 1.2/OS X 10.5@ */ + * factor not applied) @since CUPS 1.2/macOS 10.5@ */ float cupsImagingBBox[4]; /* Floating point ImagingBoundingBox * (scaling factor not applied, left, - * bottom, right, top) @since CUPS 1.2/OS X 10.5@ */ - unsigned cupsInteger[16]; /* User-defined integer values @since CUPS 1.2/OS X 10.5@ */ - float cupsReal[16]; /* User-defined floating-point values @since CUPS 1.2/OS X 10.5@ */ - char cupsString[16][64]; /* User-defined string values @since CUPS 1.2/OS X 10.5@ */ - char cupsMarkerType[64]; /* Ink/toner type @since CUPS 1.2/OS X 10.5@ */ - char cupsRenderingIntent[64];/* Color rendering intent @since CUPS 1.2/OS X 10.5@ */ - char cupsPageSizeName[64]; /* PageSize name @since CUPS 1.2/OS X 10.5@ */ + * bottom, right, top) @since CUPS 1.2/macOS 10.5@ */ + unsigned cupsInteger[16]; /* User-defined integer values @since CUPS 1.2/macOS 10.5@ */ + float cupsReal[16]; /* User-defined floating-point values @since CUPS 1.2/macOS 10.5@ */ + char cupsString[16][64]; /* User-defined string values @since CUPS 1.2/macOS 10.5@ */ + char cupsMarkerType[64]; /* Ink/toner type @since CUPS 1.2/macOS 10.5@ */ + char cupsRenderingIntent[64];/* Color rendering intent @since CUPS 1.2/macOS 10.5@ */ + char cupsPageSizeName[64]; /* PageSize name @since CUPS 1.2/macOS 10.5@ */ } cups_page_header2_t; typedef struct _cups_raster_s cups_raster_t; diff --git a/cups/request.c b/cups/request.c index 8d6d95c0c..8de44f7ed 100644 --- a/cups/request.c +++ b/cups/request.c @@ -94,7 +94,7 @@ cupsDoFileRequest(http_t *http, /* I - Connection to server or @code CUPS_HT * If "outfile" is a valid file descriptor, @code cupsDoIORequest@ copies * all of the data after the IPP response message to the file. * - * @since CUPS 1.3/OS X 10.5@ + * @since CUPS 1.3/macOS 10.5@ */ ipp_t * /* O - Response data */ @@ -310,7 +310,7 @@ cupsDoRequest(http_t *http, /* I - Connection to server or @code CUPS_HTTP_ * @link cupsReadResponseData@ after getting a successful response, * otherwise call @link httpFlush@ to complete the response processing. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ ipp_t * /* O - Response or @code NULL@ on HTTP error */ @@ -486,7 +486,7 @@ cupsLastError(void) * 'cupsLastErrorString()' - Return the last IPP status-message received on the * current thread. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ const char * /* O - status-message text from last request */ @@ -533,7 +533,7 @@ _cupsNextDelay(int current, /* I - Current delay value or 0 */ * files from @code CUPS_GET_PPD@ and @code CUPS_GET_DOCUMENT@ requests, * respectively. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ ssize_t /* O - Bytes read, 0 on EOF, -1 on error */ @@ -583,7 +583,7 @@ cupsReadResponseData( * Note: Unlike @link cupsDoFileRequest@, @link cupsDoIORequest@, and * @link cupsDoRequest@, the request is NOT freed with @link ippDelete@. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ http_status_t /* O - Initial HTTP status */ @@ -889,7 +889,7 @@ cupsSendRequest(http_t *http, /* I - Connection to server or @code CUPS_HTTP * This function is used after @link cupsSendRequest@ to provide a PPD and * after @link cupsStartDocument@ to provide a document file. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ http_status_t /* O - @code HTTP_STATUS_CONTINUE@ if OK or HTTP status on error */ diff --git a/cups/sidechannel.c b/cups/sidechannel.c index beabef33a..8070ea742 100644 --- a/cups/sidechannel.c +++ b/cups/sidechannel.c @@ -54,7 +54,7 @@ * pointed to by the "data" parameter. cupsSideChannelDoRequest() will * update the value to contain the number of data bytes in the buffer. * - * @since CUPS 1.3/OS X 10.5@ + * @since CUPS 1.3/macOS 10.5@ */ cups_sc_status_t /* O - Status of command */ @@ -93,7 +93,7 @@ cupsSideChannelDoRequest( * pointed to by the "data" parameter. cupsSideChannelDoRequest() will * update the value to contain the number of data bytes in the buffer. * - * @since CUPS 1.3/OS X 10.5@ + * @since CUPS 1.3/macOS 10.5@ */ int /* O - 0 on success, -1 on error */ @@ -293,7 +293,7 @@ cupsSideChannelRead( * support SNMP queries. @code CUPS_SC_STATUS_NO_RESPONSE@ is returned when * the printer does not respond to the SNMP query. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ cups_sc_status_t /* O - Query status */ @@ -399,7 +399,7 @@ cupsSideChannelSNMPGet( * support SNMP queries. @code CUPS_SC_STATUS_NO_RESPONSE@ is returned when * the printer does not respond to the first SNMP query. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ cups_sc_status_t /* O - Status of first query of @code CUPS_SC_STATUS_OK@ on success */ @@ -518,7 +518,7 @@ cupsSideChannelSNMPWalk( * This function is normally only called by backend programs to send * responses to a filter, driver, or port monitor program. * - * @since CUPS 1.3/OS X 10.5@ + * @since CUPS 1.3/macOS 10.5@ */ int /* O - 0 on success, -1 on error */ diff --git a/cups/sidechannel.h b/cups/sidechannel.h index 3512fa32e..3de45420a 100644 --- a/cups/sidechannel.h +++ b/cups/sidechannel.h @@ -59,9 +59,9 @@ enum cups_sc_command_e /**** Request command codes ****/ CUPS_SC_CMD_GET_BIDI = 3, /* Return bidirectional capabilities */ CUPS_SC_CMD_GET_DEVICE_ID = 4, /* Return the IEEE-1284 device ID */ CUPS_SC_CMD_GET_STATE = 5, /* Return the device state */ - CUPS_SC_CMD_SNMP_GET = 6, /* Query an SNMP OID @since CUPS 1.4/OS X 10.6@ */ - CUPS_SC_CMD_SNMP_GET_NEXT = 7, /* Query the next SNMP OID @since CUPS 1.4/OS X 10.6@ */ - CUPS_SC_CMD_GET_CONNECTED = 8, /* Return whether the backend is "connected" to the printer @since CUPS 1.5/OS X 10.7@ */ + CUPS_SC_CMD_SNMP_GET = 6, /* Query an SNMP OID @since CUPS 1.4/macOS 10.6@ */ + CUPS_SC_CMD_SNMP_GET_NEXT = 7, /* Query the next SNMP OID @since CUPS 1.4/macOS 10.6@ */ + CUPS_SC_CMD_GET_CONNECTED = 8, /* Return whether the backend is "connected" to the printer @since CUPS 1.5/macOS 10.7@ */ CUPS_SC_CMD_MAX /* End of valid values @private@ */ }; typedef enum cups_sc_command_e cups_sc_command_t; diff --git a/cups/tempfile.c b/cups/tempfile.c index 77c025594..d96ee7db1 100644 --- a/cups/tempfile.c +++ b/cups/tempfile.c @@ -168,7 +168,7 @@ cupsTempFile(char *filename, /* I - Pointer to buffer */ * The temporary filename is returned in the filename buffer. * The temporary file is opened for writing. * - * @since CUPS 1.2/OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ cups_file_t * /* O - CUPS file or @code NULL@ on error */ diff --git a/cups/tls-darwin.c b/cups/tls-darwin.c index ab9fedc6a..0dfe73a95 100644 --- a/cups/tls-darwin.c +++ b/cups/tls-darwin.c @@ -1,5 +1,5 @@ /* - * TLS support code for CUPS on OS X. + * TLS support code for CUPS on macOS. * * Copyright 2007-2016 by Apple Inc. * Copyright 1997-2007 by Easy Software Products, all rights reserved. @@ -342,7 +342,7 @@ cleanup: * Note: The server credentials are used by all threads in the running process. * This function is threadsafe. * - * @since CUPS 2.0/OS X 10.10@ + * @since CUPS 2.0/macOS 10.10@ */ int /* O - 1 on success, 0 on failure */ @@ -417,7 +417,7 @@ cupsSetServerCredentials( * 'httpCopyCredentials()' - Copy the credentials associated with the peer in * an encrypted connection. * - * @since CUPS 1.5/OS X 10.7@ + * @since CUPS 1.5/macOS 10.7@ */ int /* O - Status of call (0 = success) */ @@ -520,7 +520,7 @@ _httpCreateCredentials( /* * 'httpCredentialsAreValidForName()' - Return whether the credentials are valid for the given name. * - * @since CUPS 2.0/OS X 10.10@ + * @since CUPS 2.0/macOS 10.10@ */ int /* O - 1 if valid, 0 otherwise */ @@ -583,7 +583,7 @@ httpCredentialsAreValidForName( /* * 'httpCredentialsGetTrust()' - Return the trust of credentials. * - * @since CUPS 2.0/OS X 10.10@ + * @since CUPS 2.0/macOS 10.10@ */ http_trust_t /* O - Level of trust */ @@ -679,7 +679,7 @@ httpCredentialsGetTrust( /* * 'httpCredentialsGetExpiration()' - Return the expiration date of the credentials. * - * @since CUPS 2.0/OS X 10.10@ + * @since CUPS 2.0/macOS 10.10@ */ time_t /* O - Expiration date of credentials */ @@ -704,7 +704,7 @@ httpCredentialsGetExpiration( /* * 'httpCredentialsString()' - Return a string representing the credentials. * - * @since CUPS 2.0/OS X 10.10@ + * @since CUPS 2.0/macOS 10.10@ */ size_t /* O - Total size of credentials string */ diff --git a/cups/tls-gnutls.c b/cups/tls-gnutls.c index 504068b5e..fae13a749 100644 --- a/cups/tls-gnutls.c +++ b/cups/tls-gnutls.c @@ -291,7 +291,7 @@ cupsSetServerCredentials( * 'httpCopyCredentials()' - Copy the credentials associated with the peer in * an encrypted connection. * - * @since CUPS 1.5/OS X 10.7@ + * @since CUPS 1.5/macOS 10.7@ */ int /* O - Status of call (0 = success) */ diff --git a/cups/tls-sspi.c b/cups/tls-sspi.c index 0b41cf3d6..8d88faf7c 100644 --- a/cups/tls-sspi.c +++ b/cups/tls-sspi.c @@ -134,7 +134,7 @@ cupsSetServerCredentials( * 'httpCopyCredentials()' - Copy the credentials associated with the peer in * an encrypted connection. * - * @since CUPS 1.5/OS X 10.7@ + * @since CUPS 1.5/macOS 10.7@ */ int /* O - Status of call (0 = success) */ diff --git a/cups/usersys.c b/cups/usersys.c index bf7d789cc..9a23d7480 100644 --- a/cups/usersys.c +++ b/cups/usersys.c @@ -156,7 +156,7 @@ cupsGetPassword(const char *prompt) /* I - Prompt string */ * the @link cupsSetPasswordCB@ or @link cupsSetPasswordCB2@ functions need to * do so in each thread for the same function to be used. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ const char * /* O - Password */ @@ -214,7 +214,7 @@ cupsServer(void) * in a program. Multi-threaded programs that override the callback need to do * so in each thread for the same callback to be used. * - * @since CUPS 1.5/OS X 10.7@ + * @since CUPS 1.5/macOS 10.7@ */ void @@ -238,7 +238,7 @@ cupsSetClientCertCB( * program. Multi-threaded programs that override the setting need to do so in * each thread for the same setting to be used. * - * @since CUPS 1.5/OS X 10.7@ + * @since CUPS 1.5/macOS 10.7@ */ int /* O - Status of call (0 = success) */ @@ -326,7 +326,7 @@ cupsSetPasswordCB(cups_password_cb_t cb)/* I - Callback function */ * in a program. Multi-threaded programs that override the callback need to do * so in each thread for the same callback to be used. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ void @@ -431,7 +431,7 @@ cupsSetServer(const char *server) /* I - Server name */ * in a program. Multi-threaded programs that override the callback need to do * so in each thread for the same callback to be used. * - * @since CUPS 1.5/OS X 10.7@ + * @since CUPS 1.5/macOS 10.7@ */ void @@ -476,7 +476,7 @@ cupsSetUser(const char *user) /* I - User name */ * Setting the string to NULL forces the default value containing the CUPS * version, IPP version, and operating system version and architecture. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ void @@ -551,7 +551,7 @@ cupsUser(void) /* * 'cupsUserAgent()' - Return the default HTTP User-Agent string. * - * @since CUPS 1.7/OS X 10.9@ + * @since CUPS 1.7/macOS 10.9@ */ const char * /* O - User-Agent string */ @@ -1221,7 +1221,7 @@ cups_read_client_conf( cups_set_encryption(cc, value); #ifndef __APPLE__ /* - * The ServerName directive is not supported on OS X due to app + * The ServerName directive is not supported on macOS due to app * sandboxing restrictions, i.e. not all apps request network access. */ else if (!_cups_strcasecmp(line, "ServerName") && value) diff --git a/cups/util.c b/cups/util.c index d67df61b9..abfb8d47a 100644 --- a/cups/util.c +++ b/cups/util.c @@ -58,7 +58,7 @@ cupsCancelJob(const char *name, /* I - Name of printer or class */ * Use the @link cupsLastError@ and @link cupsLastErrorString@ functions to get * the cause of any failure. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ ipp_status_t /* O - IPP status */ @@ -146,7 +146,7 @@ cupsCancelJob2(http_t *http, /* I - Connection to server or @code CUPS_HTTP_ * print, use the @link cupsPrintFile2@ or @link cupsPrintFiles2@ function * instead. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ int /* O - Job ID or 0 on error */ @@ -226,7 +226,7 @@ cupsCreateJob( * * The document must have been started using @link cupsStartDocument@. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ ipp_status_t /* O - Status of document submission */ @@ -322,7 +322,7 @@ cupsGetDefault(void) * functions to get the user-defined default printer, as this function does * not support the lpoptions-defined default printer. * - * @since CUPS 1.1.21/OS X 10.4@ + * @since CUPS 1.1.21/macOS 10.4@ */ const char * /* O - Default printer or @code NULL@ */ @@ -413,7 +413,7 @@ cupsGetJobs(cups_job_t **jobs, /* O - Job data */ * pending, processing, or held and @code CUPS_WHICHJOBS_COMPLETED@ returns * jobs that are stopped, canceled, aborted, or completed. * - * @since CUPS 1.1.21/OS X 10.4@ + * @since CUPS 1.1.21/macOS 10.4@ */ int /* O - Number of jobs */ @@ -718,7 +718,7 @@ cupsPrintFile(const char *name, /* I - Destination name */ * 'cupsPrintFile2()' - Print a file to a printer or class on the specified * server. * - * @since CUPS 1.1.21/OS X 10.4@ + * @since CUPS 1.1.21/macOS 10.4@ */ int /* O - Job ID or 0 on error */ @@ -766,7 +766,7 @@ cupsPrintFiles( * 'cupsPrintFiles2()' - Print one or more files to a printer or class on the * specified server. * - * @since CUPS 1.1.21/OS X 10.4@ + * @since CUPS 1.1.21/macOS 10.4@ */ int /* O - Job ID or 0 on error */ @@ -896,7 +896,7 @@ cupsPrintFiles2( * @code CUPS_FORMAT_TEXT@ are provided for the "format" argument, although * any supported MIME type string can be supplied. * - * @since CUPS 1.4/OS X 10.6@ + * @since CUPS 1.4/macOS 10.6@ */ http_status_t /* O - HTTP status of request */ diff --git a/cups/versioning.h b/cups/versioning.h index 90a2b42b9..8d8691bc7 100644 --- a/cups/versioning.h +++ b/cups/versioning.h @@ -23,7 +23,7 @@ * _CUPS_API_2_0 - which add compiler-specific attributes that flag functions * that are deprecated, added in particular releases, or internal to CUPS. * - * On OS X, the _CUPS_API_* constants are defined based on the values of + * On macOS, the _CUPS_API_* constants are defined based on the values of * the MAC_OS_X_VERSION_MIN_ALLOWED and MAC_OS_X_VERSION_MAX_ALLOWED constants * provided by the compiler. */ diff --git a/doc/de/index.html.in b/doc/de/index.html.in index 307bb690c..e9170086a 100644 --- a/doc/de/index.html.in +++ b/doc/de/index.html.in @@ -24,7 +24,7 @@

    CUPS @CUPS_VERSION@

    -

    CUPS basiert auf Standards, Open Source Drucksystem entwickelt durch Apple Inc. für OS X® und andere UNIX®-artige Betriebssysteme.

    +

    CUPS basiert auf Standards, Open Source Drucksystem entwickelt durch Apple Inc. für macOS® und andere UNIX®-artige Betriebssysteme.

    diff --git a/doc/es/index.html.in b/doc/es/index.html.in index 62bed1671..7cc446da1 100644 --- a/doc/es/index.html.in +++ b/doc/es/index.html.in @@ -24,7 +24,7 @@

    CUPS @CUPS_VERSION@

    -

    CUPS es el sistema de impresión de código abierto basado en estándares desarrollado por Apple Inc. para OS X® y otros sistemas operativos tipo UNIX®.

    +

    CUPS es el sistema de impresión de código abierto basado en estándares desarrollado por Apple Inc. para macOS® y otros sistemas operativos tipo UNIX®.

    diff --git a/doc/help/api-admin.html b/doc/help/api-admin.html index b69b19d6d..5ca409614 100644 --- a/doc/help/api-admin.html +++ b/doc/help/api-admin.html @@ -5,7 +5,7 @@ Administration APIs - +