Use symbolic SEEK_xxx constants in lseek calls.

gwsw · Nov 6, 2007 · e8cf43d · e8cf43d
1 parent 40e5bfc
commit e8cf43d
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 8 deletions.
diff --git a/ch.c b/ch.c
@@ -195,7 +195,7 @@ fch_get()
  */
  if (!(ch_flags & CH_CANSEEK))
  return ('?');
- if (lseek(ch_file, (off_t)pos, 0) == BAD_LSEEK)
+ if (lseek(ch_file, (off_t)pos, SEEK_SET) == BAD_LSEEK)
  {
  error("seek error", NULL_PARG);
  clear_eol();
@@ -648,7 +648,7 @@ ch_flush()
  }
 #endif
 
- if (lseek(ch_file, (off_t)0, 0) == BAD_LSEEK)
+ if (lseek(ch_file, (off_t)0, SEEK_SET) == BAD_LSEEK)
  {
  /*
  * Warning only; even if the seek fails for some reason,
@@ -737,7 +737,7 @@ seekable(f)
  return (0);
  }
 #endif
- return (lseek(f, (off_t)1, 0) != BAD_LSEEK);
+ return (lseek(f, (off_t)1, SEEK_SET) != BAD_LSEEK);
 }
 
 /*

diff --git a/decode.c b/decode.c
@@ -682,7 +682,7 @@ lesskey(filename, sysvar)
  close(f);
  return (-1);
  }
- if (lseek(f, (off_t)0, 0) == BAD_LSEEK)
+ if (lseek(f, (off_t)0, SEEK_SET) == BAD_LSEEK)
  {
  free(buf);
  close(f);

diff --git a/edit.c b/edit.c
@@ -747,7 +747,7 @@ use_logfile(filename)
  * Append: open the file and seek to the end.
  */
  logfile = open(filename, OPEN_APPEND);
- if (lseek(logfile, (off_t)0, 2) == BAD_LSEEK)
+ if (lseek(logfile, (off_t)0, SEEK_END) == BAD_LSEEK)
  {
  close(logfile);
  logfile = -1;

diff --git a/filename.c b/filename.c
@@ -476,7 +476,7 @@ bin_file(f)
 
  if (!seekable(f))
  return (0);
- if (lseek(f, (off_t)0, 0) == BAD_LSEEK)
+ if (lseek(f, (off_t)0, SEEK_SET) == BAD_LSEEK)
  return (0);
  n = read(f, data, sizeof(data));
  for (i = 0; i < n; i++)
@@ -505,7 +505,7 @@ seek_filesize(f)
 {
  off_t spos;
 
- spos = lseek(f, (off_t)0, 2);
+ spos = lseek(f, (off_t)0, SEEK_END);
  if (spos == BAD_LSEEK)
  return (NULL_POSITION);
  return ((POSITION) spos);

diff --git a/less.h b/less.h
@@ -197,6 +197,13 @@ void free();
 
 #define BAD_LSEEK ((off_t)-1)
 
+#ifndef SEEK_SET
+#define SEEK_SET 0
+#endif
+#ifndef SEEK_END
+#define SEEK_END 2
+#endif
+
 #ifndef CHAR_BIT
 #define CHAR_BIT 8
 #endif

diff --git a/version.c b/version.c
@@ -697,6 +697,7 @@ v407 8/16/07 Fix bugs; support CSI chars.
 v408 10/1/07 Fix bug in -i with non-ASCII chars.
 v409 10/12/07 Fix crash when viewing text with invalid UTF-8 sequences.
 v411 11/6/07 Fix case-insensitive searching with non-ASCII text.
+v412 11/6/07 Use symbolic SEEK constants.
 */
 
-char version[] = "411";
+char version[] = "412";