Mercurial > emacs

changeset 101912:c28ecc931e8c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(url-generate-unique-filename): Silence compiler.
author Glenn Morris <rgm@gnu.org>
date Tue, 10 Feb 2009 03:27:29 +0000
parents a4aa4e04bc11
children 3d0115eb5d66
files lisp/url/ChangeLog lisp/url/url-util.el
diffstat 2 files changed, 23 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/url/ChangeLog	Mon Feb 09 20:05:48 2009 +0000
+++ b/lisp/url/ChangeLog	Tue Feb 10 03:27:29 2009 +0000
@@ -1,3 +1,7 @@
+2009-02-10  Glenn Morris  <rgm@gnu.org>
+
+	* url-util.el (url-generate-unique-filename): Silence compiler.
+
 2009-02-07  Chong Yidong  <cyd@stupidchicken.com>
 
 	* url-file.el (url-file): Use make-temp-file.
--- a/lisp/url/url-util.el	Mon Feb 09 20:05:48 2009 +0000
+++ b/lisp/url/url-util.el	Tue Feb 10 03:27:29 2009 +0000
@@ -1,7 +1,7 @@
 ;;; url-util.el --- Miscellaneous helper routines for URL library
 
-;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004,
-;;   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004, 2005, 2006, 2007,
+;;   2008, 2009  Free Software Foundation, Inc.
 
 ;; Author: Bill Perry <wmperry@gnu.org>
 ;; Keywords: comm, data, processes
@@ -476,25 +476,27 @@
 
 (defun url-generate-unique-filename (&optional fmt)
   "Generate a unique filename in `url-temporary-directory'."
-  (if (not fmt)
-      (let ((base (format "url-tmp.%d" (user-real-uid)))
+  ;; This variable is obsolete, but so is this function.
+  (let ((tempdir (with-no-warnings url-temporary-directory)))
+    (if (not fmt)
+	(let ((base (format "url-tmp.%d" (user-real-uid)))
+	      (fname "")
+	      (x 0))
+	  (setq fname (format "%s%d" base x))
+	  (while (file-exists-p
+		  (expand-file-name fname tempdir))
+	    (setq x (1+ x)
+		  fname (concat base (int-to-string x))))
+	  (expand-file-name fname tempdir))
+      (let ((base (concat "url" (int-to-string (user-real-uid))))
 	    (fname "")
 	    (x 0))
-	(setq fname (format "%s%d" base x))
+	(setq fname (format fmt (concat base (int-to-string x))))
 	(while (file-exists-p
-		(expand-file-name fname url-temporary-directory))
+		(expand-file-name fname tempdir))
 	  (setq x (1+ x)
-		fname (concat base (int-to-string x))))
-	(expand-file-name fname url-temporary-directory))
-    (let ((base (concat "url" (int-to-string (user-real-uid))))
-	  (fname "")
-	  (x 0))
-      (setq fname (format fmt (concat base (int-to-string x))))
-      (while (file-exists-p
-	      (expand-file-name fname url-temporary-directory))
-	(setq x (1+ x)
-	      fname (format fmt (concat base (int-to-string x)))))
-      (expand-file-name fname url-temporary-directory))))
+		fname (format fmt (concat base (int-to-string x)))))
+	(expand-file-name fname tempdir)))))
 (make-obsolete 'url-generate-unique-filename 'make-temp-file "23.1")
 
 (defun url-extract-mime-headers ()