~ubuntu-branches/ubuntu/precise/cups/precise-proposed

« back to all changes in this revision

Viewing changes to cups/language.c

  • Committer: Package Import Robot
  • Author(s): Till Kamppeter, Till Kamppeter, Martin Pitt
  • Date: 2012-05-23 15:28:01 UTC
  • mfrom: (1.2.15)
  • Revision ID: package-import@ubuntu.com-20120523152801-wfk6hrosfprn1eed
Tags: 1.5.3-0ubuntu1
[ Till Kamppeter ]
* New upstream release
   - Numerous fixes on IPP (LP: #945028, LP: #973270, LP: #990734,
     LP: #992468, LP: #992982, LP: #1000172, LP: #1000758)
   - USB backend based on the maintained libusb 1.0.x with support for
     bi-directional communication
   - Fixes on SNMP-based supply level reporting
   - PostScript prtinter auto-configuration reliable now
   - Several fixes on PostScript, SSL, authenticated printing, and
     networking issues
* debian/patches/ipp-fixes-1.5.3.patch,
  debian/patches/fix-empty-translations.patch,
  debian/patches/ppd-cache-fix-crash.patch,
  debian/patches/commandtops-make-robust-against-broken-postscript.patch,
  debian/patches/cups-polld-reconnect.patch,
  debian/patches/usb-backend-libusb-1.0.patch,
  debian/patches/usb-backend-backchannel-support.patch: Removed patches which
  got included upstream.
* debian/patches/fix-supply-level-computation-for-percent-supply-unit.patch,
  debian/patches/fix-supply-levels-for-enumerated-prtmarkersupplieslevel.patch,
  debian/patches/fix-status-reports-when-supply-levels-grow.patch,
  debian/patches/add-status-reports-for-full-waste-trays-and-cleaner-unit-eol.patch,
  debian/patches/match-marker-colorants-which-use-non-standard-string.patch,
  debian/patches/truncate-marker-supply-names-at-comma.patch: Removed supply
  level report fixes. This got solved differently upstream.
* debian/patches/do-not-suppress-inputslot-setting-with-empty-ap-d-inputslot.patch:
  Removed, problem solved differently upstream.
* debian/patches/cups-avahi.patch: Manually regenerated to adapt to upstream
  changes.
* debian/patches/ppd-poll-with-client-conf.patch,
  debian/patches/colord-support.patch,
  debian/patches/airprint-support.patch,
  debian/patches/no-conffile-timestamp.patch,
  debian/patches/drop_unnecessary_dependencies.patch,
  debian/patches/read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch,
  debian/patches/show-compile-command-lines.patch: Refreshed using quilt.
* debian/patches/usb-backend-busy-loop-fix.patch: Correct loops to repeat
  claiming interfaces on USB devices when they are busy. Before, hitting busy
  state made the device opening function error out without comment
  (LP: #987485).
* debian/patches/usb-backend-detach-usblp-earlier-crash-guards.patch: Protect
  against crashes by checking error codes of libusb functions (LP: #997040)
  and detach usblp kernel module in an earlier stage when opening a device
  (LP: #987485, LP: #997040).
* debian/patches/usb-backend-initialize-usblp-attached-state.patch: Initialize
  usblp_attached field in printer data structure to assure that detaching
  and re-attaching the usblp kernel module is always done correctly
  (LP: #902535, LP: #959676, LP: #960666, LP: #987485,
  LP: #995111, LP: #997040, LP: #1000253, LP: #1001028).
* debian/patches/install-sh-remove-bashism.patch: Removed bashism.
* debian/local/blacklist-cups-usblp.conf, debian/cups.postinst,
  debian/cups.install: Blacklist the "usblp" kernel module again. We have
  now a full-featured USB backend based on the maintained libusb 1.0.x
  and so we can acess printers always through the raw USB devices making
  the module deprecated. Detaching the kernel module for each access causes
  a lot of problems: LP: #902535, LP: #959676, LP: #960666, LP: #987485,
  LP: #995111, LP: #997040, LP: #1000253, LP: #1001028.

[ Martin Pitt ]
* debian/cups.{preinst,postinst,postrm}: Drop the removal of obsolete
  /etc/modprobe.d/blacklist-cups-usblp.conf conffile, as this file is
  reintroduced now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
/*
2
 
 * "$Id: language.c 10095 2011-11-01 06:06:15Z mike $"
 
2
 * "$Id: language.c 10379 2012-03-23 22:16:22Z mike $"
3
3
 *
4
4
 *   I18N/language support for CUPS.
5
5
 *
6
 
 *   Copyright 2007-2011 by Apple Inc.
 
6
 *   Copyright 2007-2012 by Apple Inc.
7
7
 *   Copyright 1997-2007 by Easy Software Products.
8
8
 *
9
9
 *   These coded instructions, statements, and computer programs are the
980
980
 
981
981
      if (m)
982
982
      {
983
 
        if (m->str[0])
 
983
        if (m->str && m->str[0])
984
984
        {
985
985
          cupsArrayAdd(a, m);
986
986
        }
991
991
          */
992
992
 
993
993
          free(m->id);
994
 
          free(m->str);
 
994
          if (m->str)
 
995
            free(m->str);
995
996
          free(m);
996
997
        }
997
998
      }
1024
1025
      if ((temp = realloc(m->str ? m->str : m->id,
1025
1026
                          length + strlen(ptr) + 1)) == NULL)
1026
1027
      {
 
1028
        if (m->str)
 
1029
          free(m->str);
 
1030
        free(m->id);
 
1031
        free(m);
 
1032
 
1027
1033
        cupsFileClose(fp);
1028
1034
        return (a);
1029
1035
      }
1061
1067
 
1062
1068
      if ((m->str = strdup(ptr)) == NULL)
1063
1069
      {
 
1070
        free(m->id);
 
1071
        free(m);
 
1072
 
1064
1073
        cupsFileClose(fp);
1065
1074
        return (a);
1066
1075
      }
1073
1082
 
1074
1083
  if (m)
1075
1084
  {
1076
 
    if (m->str[0])
 
1085
    if (m->str && m->str[0])
1077
1086
    {
1078
1087
      cupsArrayAdd(a, m);
1079
1088
    }
1084
1093
      */
1085
1094
 
1086
1095
      free(m->id);
1087
 
      free(m->str);
 
1096
      if (m->str)
 
1097
        free(m->str);
1088
1098
      free(m);
1089
1099
    }
1090
1100
  }
1535
1545
 
1536
1546
 
1537
1547
/*
1538
 
 * End of "$Id: language.c 10095 2011-11-01 06:06:15Z mike $".
 
1548
 * End of "$Id: language.c 10379 2012-03-23 22:16:22Z mike $".
1539
1549
 */