Rename seek functions in QUtil

Jay Berkenbilt
1 parent 0802ba27
Showing 4 changed files with 8 additions and 8 deletions
include/qpdf/QUtil.hh
libqpdf/QPDF.cc
libqpdf/QUtil.cc
qpdf/test_driver.cc
@@ -49,9 +49,9 @@ namespace QUtil
     // Wrap around off_t versions of fseek and ftell if available
     QPDF_DLL
-    int fseek_off_t(FILE* stream, qpdf_offset_t offset, int whence);
+    int seek(FILE* stream, qpdf_offset_t offset, int whence);
     QPDF_DLL
-    qpdf_offset_t ftell_off_t(FILE* stream);
+    qpdf_offset_t tell(FILE* stream);
     QPDF_DLL
     char* copy_string(std::string const&);
@@ -149,7 +149,7 @@ QPDF::FileInputSource::getName() const
 qpdf_offset_t
 QPDF::FileInputSource::tell()
 {
-    return QUtil::ftell_off_t(this->file);
+    return QUtil::tell(this->file);
 }
 void
@@ -158,7 +158,7 @@ QPDF::FileInputSource::seek(qpdf_offset_t offset, int whence)
     QUtil::os_wrapper(std::string("seek to ") + this->filename + ", offset " +
 		      QUtil::int_to_string(offset) + " (" +
 		      QUtil::int_to_string(whence) + ")",
-		      QUtil::fseek_off_t(this->file, offset, whence));
+		      QUtil::seek(this->file, offset, whence));
 }
 void
@@ -170,7 +170,7 @@ QPDF::FileInputSource::rewind()
 size_t
 QPDF::FileInputSource::read(char* buffer, size_t length)
 {
-    this->last_offset = QUtil::ftell_off_t(this->file);
+    this->last_offset = QUtil::tell(this->file);
     size_t len = fread(buffer, 1, length, this->file);
     if ((len == 0) && ferror(this->file))
     {
@@ -122,7 +122,7 @@ QUtil::fopen_wrapper(std::string const&amp; description, FILE* f)
 }
 int
-QUtil::fseek_off_t(FILE* stream, qpdf_offset_t offset, int whence)
+QUtil::seek(FILE* stream, qpdf_offset_t offset, int whence)
 {
 #if HAVE_FSEEKO
     return fseeko(stream, (off_t)offset, whence);
@@ -138,7 +138,7 @@ QUtil::fseek_off_t(FILE* stream, qpdf_offset_t offset, int whence)
 }
 qpdf_offset_t
-QUtil::ftell_off_t(FILE* stream)
+QUtil::tell(FILE* stream)
 {
 #if HAVE_FSEEKO
     return (qpdf_offset_t)ftello(stream);
@@ -113,7 +113,7 @@ void runtest(int n, char const* filename)
 	FILE* f = QUtil::fopen_wrapper(std::string("open ") + filename,
 				       fopen(filename, "rb"));
 	fseek(f, 0, SEEK_END);
-	size_t size = (size_t) QUtil::ftell_off_t(f);
+	size_t size = (size_t) QUtil::tell(f);
 	fseek(f, 0, SEEK_SET);
 	file_buf = PointerHolder<char>(true, new char[size]);
 	char* buf_p = file_buf.getPointer();