head 1.1; access; symbols pkgsrc-2026Q1:1.1.0.108 pkgsrc-2026Q1-base:1.1 pkgsrc-2025Q4:1.1.0.106 pkgsrc-2025Q4-base:1.1 pkgsrc-2025Q3:1.1.0.104 pkgsrc-2025Q3-base:1.1 pkgsrc-2025Q2:1.1.0.102 pkgsrc-2025Q2-base:1.1 pkgsrc-2025Q1:1.1.0.100 pkgsrc-2025Q1-base:1.1 pkgsrc-2024Q4:1.1.0.98 pkgsrc-2024Q4-base:1.1 pkgsrc-2024Q3:1.1.0.96 pkgsrc-2024Q3-base:1.1 pkgsrc-2024Q2:1.1.0.94 pkgsrc-2024Q2-base:1.1 pkgsrc-2024Q1:1.1.0.92 pkgsrc-2024Q1-base:1.1 pkgsrc-2023Q4:1.1.0.90 pkgsrc-2023Q4-base:1.1 pkgsrc-2023Q3:1.1.0.88 pkgsrc-2023Q3-base:1.1 pkgsrc-2023Q2:1.1.0.86 pkgsrc-2023Q2-base:1.1 pkgsrc-2023Q1:1.1.0.84 pkgsrc-2023Q1-base:1.1 pkgsrc-2022Q4:1.1.0.82 pkgsrc-2022Q4-base:1.1 pkgsrc-2022Q3:1.1.0.80 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.78 pkgsrc-2022Q2-base:1.1 pkgsrc-2022Q1:1.1.0.76 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.74 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.72 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.70 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.68 pkgsrc-2021Q1-base:1.1 pkgsrc-2020Q4:1.1.0.66 pkgsrc-2020Q4-base:1.1 pkgsrc-2020Q3:1.1.0.64 pkgsrc-2020Q3-base:1.1 pkgsrc-2020Q2:1.1.0.60 pkgsrc-2020Q2-base:1.1 pkgsrc-2020Q1:1.1.0.40 pkgsrc-2020Q1-base:1.1 pkgsrc-2019Q4:1.1.0.62 pkgsrc-2019Q4-base:1.1 pkgsrc-2019Q3:1.1.0.58 pkgsrc-2019Q3-base:1.1 pkgsrc-2019Q2:1.1.0.56 pkgsrc-2019Q2-base:1.1 pkgsrc-2019Q1:1.1.0.54 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.52 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.50 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.48 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.46 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.44 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.42 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.38 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.36 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.34 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.32 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.30 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.28 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.26 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.24 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.22 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.20 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.18 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.16 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.14 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.12 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.10 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.8 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.6 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.4 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.2 pkgsrc-2012Q4-base:1.1; locks; strict; comment @// @; 1.1 date 2012.12.21.10.29.47; author dholland; state Exp; branches; next ; desc @@ 1.1 log @Chase after that moving target known lightly as the C++ "standard". Fixes build. Also clean up insecure-temporary-files. PKGREVISION -> 1. @ text @$NetBSD$ Chase after the C++ standard: - use the newfangled names for C++ headers - use "std" qualification - string constants are const char * --- doctype/usmarc.cxx~ 1999-06-05 00:54:00.000000000 +0000 +++ doctype/usmarc.cxx @@@@ -9,7 +9,7 @@@@ Modified by Bjorn L. Thordarson */ -#include +#include #include "isearch.hxx" #include "marc.hxx" #include "usmarc.hxx" @@@@ -35,10 +35,10 @@@@ USMARC::USMARC(PIDBOBJ DbParent) struct ParseEntry { - char *field; - char *subfield; - char *tag; - char *name; + const char *field; + const char *subfield; + const char *tag; + const char *name; }; // Maps a character string representation of a marc field @@@@ -126,7 +126,7 @@@@ USMARC::ParseRecords(const RECORD& FileR FileRecord.GetFullFileName (&fn); PFILE fp = fopen (fn, "rb"); if (!fp) { - cout << "Could not access '" << fn << "'" << EOL; + std::cout << "Could not access '" << fn << "'" << EOL; return; // File not accessed } @@@@ -145,7 +145,7 @@@@ USMARC::ParseRecords(const RECORD& FileR int RS = 0; // we also know the first record will begin @@ 0. if(fseek(fp, 0, SEEK_SET) == -1) { - cout << "USMARC::ParseRecords(): Seek failed - " << fn << "\n"; + std::cout << "USMARC::ParseRecords(): Seek failed - " << fn << "\n"; fclose(fp); return; } @@@@ -158,14 +158,14 @@@@ USMARC::ParseRecords(const RECORD& FileR marcLength = atoi(LenBuff); if (marcLength <= 0) { - cout << "Something went awry trying to read MARC record Length in " + std::cout << "Something went awry trying to read MARC record Length in " << fn << " \n"; return; } // else we must have a valid marcLength now, so lets burn some characters if (fseek(fp, marcLength - 5, SEEK_CUR) < 0) { - cout << "Something went awry trying to read MARC record" + std::cout << "Something went awry trying to read MARC record" << fn << " \n"; return; } @@@@ -189,7 +189,7 @@@@ USMARC::readFileContents(PRECORD NewReco file = fn.NewCString(); fp = fopen(fn, "rb"); if (!fp) { - cout << "USMARC::ParseRecords(): Failed to open file\n\t"; + std::cout << "USMARC::ParseRecords(): Failed to open file\n\t"; perror(file); return; } @@@@ -200,23 +200,23 @@@@ USMARC::readFileContents(PRECORD NewReco if (RecEnd == 0) { if(fseek(fp, 0L, SEEK_END) == -1) { - cout << "USMARC::ParseRecords(): Seek failed - "; - cout << fn << "\n"; + std::cout << "USMARC::ParseRecords(): Seek failed - "; + std::cout << fn << "\n"; fclose(fp); return; } RecStart = 0; RecEnd = ftell(fp); if(RecEnd == 0) { - cout << "USMARC::ParseRecords(): Skipping "; - cout << " zero-length record -" << fn << "...\n"; + std::cout << "USMARC::ParseRecords(): Skipping "; + std::cout << " zero-length record -" << fn << "...\n"; fclose(fp); return; } //RecEnd -= 1; } if(fseek(fp, (long)RecStart, SEEK_SET) == -1) { - cout << "USMARC::ParseRecords(): Seek failed - " << fn << "\n"; + std::cout << "USMARC::ParseRecords(): Seek failed - " << fn << "\n"; fclose(fp); return; } @@@@ -224,16 +224,16 @@@@ USMARC::readFileContents(PRECORD NewReco RecBuffer = new CHR[RecLength + 1]; if(!RecBuffer) { - cout << "USMARC::ParseRecords(): Failed to allocate "; - cout << RecLength + 1 << " bytes - " << fn << "\n"; + std::cout << "USMARC::ParseRecords(): Failed to allocate "; + std::cout << RecLength + 1 << " bytes - " << fn << "\n"; fclose(fp); return; } GPTYPE ActualLength = (GPTYPE)fread(RecBuffer, 1, RecLength, fp); if(ActualLength == 0) { - cout << "USMARC::ParseRecords(): Failed to fread\n\t"; - cout << "RecLength is: " << RecLength << endl; + std::cout << "USMARC::ParseRecords(): Failed to fread\n\t"; + std::cout << "RecLength is: " << RecLength << std::endl; perror(file); delete [] RecBuffer; fclose(fp); @@@@ -241,9 +241,9 @@@@ USMARC::readFileContents(PRECORD NewReco } fclose(fp); if(ActualLength != RecLength) { - cout << "USMARC::ParseRecords(): Failed to fread "; - cout << RecLength << " bytes. Actually read " << ActualLength; - cout << " bytes - " << fn << "\n"; + std::cout << "USMARC::ParseRecords(): Failed to fread "; + std::cout << RecLength << " bytes. Actually read " << ActualLength; + std::cout << " bytes - " << fn << "\n"; delete [] RecBuffer; return; } @@@@ -331,7 +331,7 @@@@ USMARC::usefulMarcField(char *fieldStr) } int -USMARC::compareReg(char *s1 , char *s2) { +USMARC::compareReg(const char *s1 , const char *s2) { if (s1 == NULL || s2 == NULL) { // FIXME: Think out behavior if this happens } @@@@ -423,7 +423,7 @@@@ USMARC::ParseFields(PRECORD NewRecord) // if so, then add it again using the name we give it. PDFT pdft = new DFT(); if(!pdft) { - cout << "USMARC::ParseRecords(): Failed to allocate DFT \n"; + std::cout << "USMARC::ParseRecords(): Failed to allocate DFT \n"; delete [] RecBuffer; delete [] marcDir; return; @@@@ -510,13 +510,13 @@@@ USMARC::ParseWords(CHR* DataBuffer, INT char *tmp = new char[e - s + 1]; strncpy(tmp, DataBuffer + s, e - s); tmp[e - s] = 0x00; - cerr << "DataBuffer: " << tmp << endl; + cerr << "DataBuffer: " << tmp << std::endl; delete []tmp; tmp = new char[e - s + 1]; strncpy(tmp, RecBuffer + s, e - s); tmp[e - s] = 0x00; - cerr << "RecBuffer: " << tmp << endl; + cerr << "RecBuffer: " << tmp << std::endl; delete []tmp;*/ } // end of while loop; @