xemacs-beta: src/fileio.c comparison

comparison src/fileio.c @ 5581:56144c8593a8

Mechanically change INT to FIXNUM in our sources. src/ChangeLog addition: 2011-10-09 Aidan Kehoe <kehoea@parhasard.net> [...] Mechanically change INT (where it refers to non-bignum Lisp integers) to FIXNUM in our sources. Done for the following functions, enums, and macros: Lisp_Type_Int_Even, Lisp_Type_Int_Odd, INT_GCBITS, INT_VALBITS, make_int(), INTP(), XINT(), CHECK_INT(), XREALINT(), INT_PLUS(), INT_MINUS(), EMACS_INT_MAX (to MOST_POSITIVE_FIXNUM), EMACS_INT_MIN (to MOST_NEGATIVE_FIXNUM), NUMBER_FITS_IN_AN_EMACS_INT() to NUMBER_FITS_IN_A_FIXNUM(), XFLOATINT, XCHAR_OR_INT, INT_OR_FLOAT. The EMACS_INT typedef was not changed, it does not describe non-bignum Lisp integers. Script that did the change available in http://mid.gmane.org/20067.17650.181273.12014@parhasard.net . modules/ChangeLog addition: 2011-10-09 Aidan Kehoe <kehoea@parhasard.net> [...] Mechanically change INT to FIXNUM, where the usage describes non-bignum Lisp integers. See the src/ChangeLog entry for more details. man/ChangeLog addition: 2011-10-09 Aidan Kehoe <kehoea@parhasard.net> * internals/internals.texi (How Lisp Objects Are Represented in C): * internals/internals.texi (Integers and Characters): Mechanically change INT to FIXNUM, where the usage describes non-bignum Lisp integers.

author	Aidan Kehoe <kehoea@parhasard.net>
date	Sun, 09 Oct 2011 09:51:57 +0100
parents	4dee0387b9de
children	65d65b52d608

comparison

equal deleted inserted replaced

-:a0e81357194e
+:56144c8593a8
 static Lisp_Object
 close_file_unwind (Lisp_Object fd)
 {
 if (CONSP (fd))
 {
-if (INTP (XCAR (fd)))
+if (FIXNUMP (XCAR (fd)))
-	retry_close (XINT (XCAR (fd)));
+	retry_close (XFIXNUM (XCAR (fd)));
 free_cons (fd);
 }
 else
-retry_close (XINT (fd));
+retry_close (XFIXNUM (fd));
 return Qnil;
 }
 static Lisp_Object
 newname = Fconcat (i, args);
 NUNGCPRO;
 }
 if (NILP (ok_if_already_exists)
-|| INTP (ok_if_already_exists))
+|| FIXNUMP (ok_if_already_exists))
 barf_or_query_if_file_exists (newname, "copy to it",
-				  INTP (ok_if_already_exists), &out_st);
+				  FIXNUMP (ok_if_already_exists), &out_st);
 else if (qxe_stat (XSTRING_DATA (newname), &out_st) < 0)
 out_st.st_mode = 0;
 ifd = qxe_interruptible_open (XSTRING_DATA (filename),
 				O_RDONLY | OPEN_BINARY, 0);
 if (ifd < 0)
 report_file_error ("Opening input file", filename);
-record_unwind_protect (close_file_unwind, make_int (ifd));
+record_unwind_protect (close_file_unwind, make_fixnum (ifd));
 /* We can only copy regular files and symbolic links.  Other files are not
 copyable by us. */
 input_file_statable_p = (qxe_fstat (ifd, &st) >= 0);
 		  O_WRONLY | O_CREAT | O_TRUNC | OPEN_BINARY, CREAT_MODE);
 if (ofd < 0)
 report_file_error ("Opening output file", newname);
 {
-Lisp_Object ofd_locative = noseeum_cons (make_int (ofd), Qnil);
+Lisp_Object ofd_locative = noseeum_cons (make_fixnum (ofd), Qnil);
 record_unwind_protect (close_file_unwind, ofd_locative);
 while ((n = read_allowing_quit (ifd, buf, sizeof (buf))) > 0)
 {
 newname = Fconcat (i, args);
 NUNGCPRO;
 }
 if (NILP (ok_if_already_exists)
-|| INTP (ok_if_already_exists))
+|| FIXNUMP (ok_if_already_exists))
 barf_or_query_if_file_exists (newname, "rename to it",
-				  INTP (ok_if_already_exists), 0);
+				  FIXNUMP (ok_if_already_exists), 0);
 /* We have configure check for rename() and emulate using
 link()/unlink() if necessary. */
 if (0 > qxe_rename (XSTRING_DATA (filename), XSTRING_DATA (newname)))
 {
 if (!NILP (handler))
 RETURN_UNGCPRO (call4 (handler, Qadd_name_to_file, filename,
 			   newname, ok_if_already_exists));
 if (NILP (ok_if_already_exists)
-|| INTP (ok_if_already_exists))
+|| FIXNUMP (ok_if_already_exists))
 barf_or_query_if_file_exists (newname, "make it a new name",
-				  INTP (ok_if_already_exists), 0);
+				  FIXNUMP (ok_if_already_exists), 0);
 /* #### Emacs 20.6 contains an implementation of link() in w32.c.
 Need to port. */
 #ifndef HAVE_LINK
 signal_error_2 (Qunimplemented, "Adding new name", filename, newname);
 #else /* HAVE_LINK */
 RETURN_UNGCPRO (call4 (handler, Qmake_symbolic_link, filename,
 			   linkname, ok_if_already_exists));
 #ifdef HAVE_SYMLINK
 if (NILP (ok_if_already_exists)
-|| INTP (ok_if_already_exists))
+|| FIXNUMP (ok_if_already_exists))
 barf_or_query_if_file_exists (linkname, "make it a link",
-				  INTP (ok_if_already_exists), 0);
+				  FIXNUMP (ok_if_already_exists), 0);
 qxe_unlink (XSTRING_DATA (linkname));
 if (0 > qxe_symlink (XSTRING_DATA (filename),
 		       XSTRING_DATA (linkname)))
 {
 if (check_executable (abspath))
 st.st_mode |= S_IEXEC;
 #endif /* WIN32_NATIVE */
 #endif /* 0 */
-return make_int (st.st_mode & 07777);
+return make_fixnum (st.st_mode & 07777);
 }
 DEFUN ("set-file-modes", Fset_file_modes, 2, 2, 0, /*
 Set mode bits of file named FILENAME to MODE (an integer).
 Only the 12 low bits of MODE are used.
 GCPRO1 (current_buffer->directory);
 abspath = Fexpand_file_name (filename, current_buffer->directory);
 UNGCPRO;
-CHECK_INT (mode);
+CHECK_FIXNUM (mode);
 /* If the file name has special constructs in it,
 call the corresponding file handler.  */
 GCPRO1 (abspath);
 handler = Ffind_file_name_handler (abspath, Qset_file_modes);
 UNGCPRO;
 if (!NILP (handler))
 return call3 (handler, Qset_file_modes, abspath, mode);
-if (qxe_chmod (XSTRING_DATA (abspath), XINT (mode)) < 0)
+if (qxe_chmod (XSTRING_DATA (abspath), XFIXNUM (mode)) < 0)
 report_file_error ("Doing chmod", abspath);
 return Qnil;
 }
 to that bit enabled.  Only the low 9 bits are used.
 This setting is inherited by subprocesses.
 */
 (mode))
 {
-CHECK_INT (mode);
+CHECK_FIXNUM (mode);
-umask ((~ XINT (mode)) & 0777);
+umask ((~ XFIXNUM (mode)) & 0777);
 return Qnil;
 }
 DEFUN ("default-file-modes", Fdefault_file_modes, 0, 0, 0, /*
 int mode;
 mode = umask (0);
 umask (mode);
-return make_int ((~ mode) & 0777);
+return make_fixnum ((~ mode) & 0777);
 }
 DEFUN ("unix-sync", Funix_sync, 0, 0, "", /*
 Tell Unix to finish all pending disk updates.
 */
 	}
 }
 #endif /* S_IFREG */
 if (!NILP (start))
-CHECK_INT (start);
+CHECK_FIXNUM (start);
 else
 start = Qzero;
 if (!NILP (end))
-CHECK_INT (end);
+CHECK_FIXNUM (end);
 if (fd < 0)
 {
 if ((fd = qxe_interruptible_open (XSTRING_DATA (filename),
 					O_RDONLY | OPEN_BINARY, 0)) < 0)
 /* Replacement should preserve point as it preserves markers.  */
 if (!NILP (replace))
 record_unwind_protect (restore_point_unwind, Fpoint_marker (Qnil, Qnil));
-record_unwind_protect (close_file_unwind, make_int (fd));
+record_unwind_protect (close_file_unwind, make_fixnum (fd));
 /* Supposedly happens on VMS.  */
 if (st.st_size < 0)
 signal_error (Qfile_error, "File size is negative", Qunbound);
 if (NILP (end))
 {
 if (!not_regular)
 	{
-	  end = make_int (st.st_size);
+	  end = make_fixnum (st.st_size);
-	  if (XINT (end) != st.st_size)
+	  if (XFIXNUM (end) != st.st_size)
 	    out_of_memory ("Maximum buffer size exceeded", Qunbound);
 	}
 }
 /* If requested, replace the accessible part of the buffer
 	    (same_at_end + st.st_size - BUF_ZV (buf));
 	  if (overlap > 0)
 	    same_at_end += overlap;
 	  /* Arrange to read only the nonmatching middle part of the file.  */
-	  start = make_int (same_at_start - BUF_BEGV (buf));
+	  start = make_fixnum (same_at_start - BUF_BEGV (buf));
-	  end = make_int (st.st_size - (BUF_ZV (buf) - same_at_end));
+	  end = make_fixnum (st.st_size - (BUF_ZV (buf) - same_at_end));
 	  buffer_delete_range (buf, same_at_start, same_at_end,
 			       !NILP (visit) ? INSDEL_NO_LOCKING : 0);
 	  /* Insert from the file at the proper position.  */
 	  BUF_SET_PT (buf, same_at_start);
 	}
 }
 if (!not_regular)
 {
-total = XINT (end) - XINT (start);
+total = XFIXNUM (end) - XFIXNUM (start);
 /* Make sure point-max won't overflow after this insertion.  */
-if (total != XINT (make_int (total)))
+if (total != XFIXNUM (make_fixnum (total)))
 	out_of_memory ("Maximum buffer size exceeded", Qunbound);
 }
 else
 /* For a special file, all we can do is guess.  The value of -1
 will make the stream functions read as much as possible.  */
 total = -1;
-if (XINT (start) != 0
+if (XFIXNUM (start) != 0
 /* why was this here? asked jwz.  The reason is that the replace-mode
 	 connivings above will normally put the file pointer other than
 	 where it should be. */
 || (!NILP (replace) && do_speedy_insert))
 {
-if (lseek (fd, XINT (start), 0) < 0)
+if (lseek (fd, XFIXNUM (start), 0) < 0)
 	report_file_error ("Setting file position", filename);
 }
 {
 Charbpos cur_point = BUF_PT (buf);
 	  ignored. */
 if (!NILP (Ffboundp (Qcompute_buffer_file_truename)))
 	call1 (Qcompute_buffer_file_truename, wrap_buffer (buf));
 BUF_SAVE_MODIFF (buf) = BUF_MODIFF (buf);
 buf->auto_save_modified = BUF_MODIFF (buf);
-buf->saved_size = make_int (BUF_SIZE (buf));
+buf->saved_size = make_fixnum (BUF_SIZE (buf));
 #ifdef CLASH_DETECTION
 if (!NILP (buf->file_truename))
 	unlock_file (buf->file_truename);
 unlock_file (filename);
 #endif /* CLASH_DETECTION */
 }
 /* Decode file format */
 if (inserted > 0 && !UNBOUNDP (XSYMBOL_FUNCTION (Qformat_decode)))
 {
-Lisp_Object insval = call3 (Qformat_decode, Qnil, make_int (inserted),
+Lisp_Object insval = call3 (Qformat_decode, Qnil, make_fixnum (inserted),
 				  visit);
-CHECK_INT (insval);
+CHECK_FIXNUM (insval);
-inserted = XINT (insval);
+inserted = XFIXNUM (insval);
 }
 if (inserted > 0)
 {
 GC_EXTERNAL_LIST_LOOP_2 (p, Vafter_insert_file_functions)
 	{
-	  Lisp_Object insval = call1 (p, make_int (inserted));
+	  Lisp_Object insval = call1 (p, make_fixnum (inserted));
 	  if (!NILP (insval))
 	    {
-check_integer_range (insval, Qzero, make_int (EMACS_INT_MAX));
+check_integer_range (insval, Qzero, make_fixnum (MOST_POSITIVE_FIXNUM));
-	      inserted = XINT (insval);
+	      inserted = XFIXNUM (insval);
 	    }
 	}
 END_GC_EXTERNAL_LIST_LOOP (p);
 }
 UNGCPRO;
 if (!NILP (val))
 return (val);
 else
-return (list2 (filename, make_int (inserted)));
+return (list2 (filename, make_fixnum (inserted)));
 }
 static int a_write (Lisp_Object outstream, Lisp_Object instream, int pos,
 		    Lisp_Object *annot);
 Lisp_Object val = call8 (handler, Qwrite_region, start, end,
 filename, append, visit, lockname, codesys);
 	if (visiting)
 	  {
 	    BUF_SAVE_MODIFF (current_buffer) = BUF_MODIFF (current_buffer);
-	    current_buffer->saved_size = make_int (BUF_SIZE (current_buffer));
+	    current_buffer->saved_size = make_fixnum (BUF_SIZE (current_buffer));
 	    current_buffer->filename = visit_file;
 	    MARK_MODELINE_CHANGED;
 	  }
 	NUNGCPRO;
 	UNGCPRO;
 #endif /* CLASH_DETECTION */
 report_file_error ("Opening output file", filename);
 }
 {
-Lisp_Object desc_locative = Fcons (make_int (desc), Qnil);
+Lisp_Object desc_locative = Fcons (make_fixnum (desc), Qnil);
 Lisp_Object instream = Qnil, outstream = Qnil;
 struct gcpro nngcpro1, nngcpro2;
 NNGCPRO2 (instream, outstream);
 record_unwind_protect (close_file_unwind, desc_locative);
 }
 if (visiting)
 {
 BUF_SAVE_MODIFF (current_buffer) = BUF_MODIFF (current_buffer);
-current_buffer->saved_size = make_int (BUF_SIZE (current_buffer));
+current_buffer->saved_size = make_fixnum (BUF_SIZE (current_buffer));
 current_buffer->filename = visit_file;
 MARK_MODELINE_CHANGED;
 }
 else if (quietly)
 {
 	 Reset START and END from the buffer bounds
 	 and discard all previous annotations because they should have
 	 been dealt with by this function.  */
 if (current_buffer != given_buffer)
 	{
-	  start = make_int (BUF_BEGV (current_buffer));
+	  start = make_fixnum (BUF_BEGV (current_buffer));
-	  end = make_int (BUF_ZV (current_buffer));
+	  end = make_fixnum (BUF_ZV (current_buffer));
 	  annotations = Qnil;
 	}
 Flength (res);     /* Check basic validity of return value */
 annotations = list_merge (annotations, res, check_lss_key_car, Qnil,
 				Qnil);
 Vwrite_region_annotations_so_far = annotations;
 res = call4 (Qformat_annotate_function, Fcar (p), start, end,
 		   original_buffer);
 if (current_buffer != given_buffer)
 	{
-	  start = make_int (BUF_BEGV (current_buffer));
+	  start = make_fixnum (BUF_BEGV (current_buffer));
-	  end = make_int (BUF_ZV (current_buffer));
+	  end = make_fixnum (BUF_ZV (current_buffer));
 	  annotations = Qnil;
 	}
 Flength (res);
 annotations = list_merge (annotations, res, check_lss_key_car, Qnil,
 				Qnil);
 Lstream *outstr = XLSTREAM (outstream);
 while (LISTP (*annot))
 {
 tem = Fcar_safe (Fcar (*annot));
-if (INTP (tem))
+if (FIXNUMP (tem))
-	nextpos = XINT (tem);
+	nextpos = XFIXNUM (tem);
 else
 	nextpos = INT_MAX;
 #ifdef MULE
 /* If there are annotations left and we have Mule, then we
 	 have to do the I/O one ichar at a time so we can
 if (preparing_for_armageddon)
 return Qnil;
 clear_echo_area (selected_frame (), Qauto_saving, 1);
 Fding (Qt, Qauto_save_error, Qnil);
 message ("Auto-saving...error for %s", XSTRING_DATA (current_buffer->name));
-Fsleep_for (make_int (1));
+Fsleep_for (make_fixnum (1));
 message ("Auto-saving...error!for %s", XSTRING_DATA (current_buffer->name));
-Fsleep_for (make_int (1));
+Fsleep_for (make_fixnum (1));
 message ("Auto-saving...error for %s", XSTRING_DATA (current_buffer->name));
-Fsleep_for (make_int (1));
+Fsleep_for (make_fixnum (1));
 return Qnil;
 }
 static Lisp_Object
 auto_save_1 (Lisp_Object UNUSED (ignored))
 static Lisp_Object
 do_auto_save_unwind (Lisp_Object fd)
 {
-retry_close (XINT (fd));
+retry_close (XFIXNUM (fd));
 return (fd);
 }
 /* Fdo_auto_save() checks whether a GC is in progress when it is called,
 and if so, tries to avoid touching lisp objects.
 	     and file changed since last real save.  */
 	  if (STRINGP (b->auto_save_file_name)
 	      && BUF_SAVE_MODIFF (b) < BUF_MODIFF (b)
 	      && b->auto_save_modified < BUF_MODIFF (b)
 	      /* -1 means we've turned off autosaving for a while--see below.  */
-	      && XINT (b->saved_size) >= 0
+	      && XFIXNUM (b->saved_size) >= 0
 	      && (do_handled_files
 		  || NILP (Ffind_file_name_handler (b->auto_save_file_name,
 						    Qwrite_region))))
 	    {
 	      EMACS_TIME before_time, after_time;
 		  && (EMACS_SECS (before_time) - b->auto_save_failure_time <
 		      1200))
 		continue;
 	      if (!preparing_for_armageddon &&
-		  (XINT (b->saved_size) * 10
+		  (XFIXNUM (b->saved_size) * 10
 		   > (BUF_Z (b) - BUF_BEG (b)) * 13)
 		  /* A short file is likely to change a large fraction;
 		     spare the user annoying messages.  */
-		  && XINT (b->saved_size) > 5000
+		  && XFIXNUM (b->saved_size) > 5000
 		  /* These messages are frequent and annoying for `*mail*'.  */
 		  && !NILP (b->filename)
 		  && NILP (no_message)
 		  && disable_auto_save_when_buffer_shrinks)
 		{
 		  message
 		    ("Buffer %s has shrunk a lot; auto save turned off there",
 		     XSTRING_DATA (b->name));
 		  /* Turn off auto-saving until there's a real save,
 		     and prevent any more warnings.  */
-		  b->saved_size = make_int (-1);
+		  b->saved_size = make_fixnum (-1);
 		  if (!gc_in_progress)
-		    Fsleep_for (make_int (1));
+		    Fsleep_for (make_fixnum (1));
 		  continue;
 		}
 	      set_buffer_internal (b);
 	      if (!auto_saved && NILP (no_message))
 		{
 		  /* Arrange to close that file whether or not we get
 		     an error. */
 		  if (listdesc >= 0)
 		    record_unwind_protect (do_auto_save_unwind,
-					   make_int (listdesc));
+					   make_fixnum (listdesc));
 		}
 	      /* Record all the buffers that we are auto-saving in
 		 the special file that lists them.  For each of
 		 these buffers, record visited name (if any) and
 	      /* Handler killed their own buffer! */
 	      if (!BUFFER_LIVE_P (b))
 		continue;
 	      b->auto_save_modified = BUF_MODIFF (b);
-	      b->saved_size = make_int (BUF_SIZE (b));
+	      b->saved_size = make_fixnum (BUF_SIZE (b));
 	      EMACS_GET_TIME (after_time);
 	      /* If auto-save took more than 60 seconds,
 		 assume it was an NFS failure that got a timeout.  */
 	      if (EMACS_SECS (after_time) - EMACS_SECS (before_time) > 60)
 		b->auto_save_failure_time = EMACS_SECS (after_time);
 No auto-save file will be written until the buffer changes again.
 */
 ())
 {
 current_buffer->auto_save_modified = BUF_MODIFF (current_buffer);
-current_buffer->saved_size = make_int (BUF_SIZE (current_buffer));
+current_buffer->saved_size = make_fixnum (BUF_SIZE (current_buffer));
 current_buffer->auto_save_failure_time = -1;
 return Qnil;
 }
 DEFUN ("clear-buffer-auto-save-failure", Fclear_buffer_auto_save_failure, 0, 0, 0, /*

Mercurial > hg > xemacs-beta

comparison src/fileio.c @ 5581:56144c8593a8