← Back to branch summary

~ubuntu-branches/ubuntu/lucid/xml-security-c/lucid

« back to all changes in this revision

Viewing changes to src/tools/cipher/cipher.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Russ Allbery
  • Date: 2009-08-05 14:11:52 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20090805141152-a7xyrgur2sq3exkr
Tags: 1.5.1-1
* New upstream release.
  - Rename library package for upstream SONAME bump.
* Upstream now ships an older version of libtool, so run libtoolize and
  aclocal before the build.  Add build dependencies on automake and
  libtool.
* Build against Xerces-C 3.0.
* Stop building against Xalan.  The Xalan packages for Debian have been
  orphaned, the current Xalan release does not support Xerces-C 3.0, and
  porting it is not trivial.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/tools/cipher/cipher.cpp
21
21
 *
22
22
 * Author(s): Berin Lautenbach
23
23
 *
24
 
 * $Id: cipher.cpp 450286 2006-09-27 01:47:51Z blautenb $
 
24
 * $Id: cipher.cpp 724055 2008-12-06 23:34:24Z scantor $
25
25
 *
26
26
 */
27
27
 
557
557
 
558
558
                // Now parse out file
559
559
 
560
 
                int errorCount = 0;
 
560
                xsecsize_t errorCount = 0;
561
561
                try
562
562
                {
563
563
                parser->parse(filename);
681
681
                                Janitor<XSECBinTXFMInputStream> j_bis(bis);
682
682
        
683
683
                                XMLByte buf[1024];                      
684
 
                                unsigned int read = bis->readBytes(buf, 1023);
 
684
                                xsecsize_t read = bis->readBytes(buf, 1023);
685
685
                                while (read > 0) {
686
686
                                        formatTarget->writeChars(buf, read, NULL);
687
687
                                        read = bis->readBytes(buf, 1023);