CVS update: /ccvs/src/

[email protected] 12 Jul 2005 13:46:41 -0000
Newsgroups gmane.comp.version-control.cvs.cvs
Message-ID <[email protected]>
User: dprice  
Date: 05/07/12 06:46:41

Modified:
 /ccvs/src/
  ChangeLog, client.c

Log:
 * client.c: Update fwrite usage to use size & count in the standard
 order.

File Changes:

Directory: /ccvs/src/
=====================

File [changed]: ChangeLog
Url: https://ccvs.cvshome.org/source/browse/ccvs/src/ChangeLog?r1=1.3216&r2=1.3217
Delta lines:  +5 -0
-------------------
--- ChangeLog	11 Jul 2005 16:09:16 -0000	1.3216
+++ ChangeLog	12 Jul 2005 13:46:38 -0000	1.3217
@@ -1,3 +1,8 @@
+2005-07-12  Derek Price  <[email protected]>
+
+	* client.c: Update fwrite usage to use size & count in the standard
+	order.
+
 2005-07-11  Derek Price  <[email protected]>
 
 	* buffer.c, buffer.h, client.h, expand_path.c, history.c, myndbm.h,

File [changed]: client.c
Url: https://ccvs.cvshome.org/source/browse/ccvs/src/client.c?r1=1.428&r2=1.429
Delta lines:  +6 -5
-------------------
--- client.c	3 Jun 2005 18:26:08 -0000	1.428
+++ client.c	12 Jul 2005 13:46:38 -0000	1.429
@@ -1189,7 +1189,7 @@
 
 	if (nwrite > 0)
 	{
-	    n = fwrite (pwrite, 1, nwrite, fp);
+	    n = fwrite (pwrite, sizeof *pwrite, nwrite, fp);
 	    if (ferror (fp))
 		error (1, errno, "cannot write %s", fullname);
 	    nwrite -= n;
@@ -1719,7 +1719,8 @@
 
 		    e = xfopen (temp_filename,
 				bin ? FOPEN_BINARY_WRITE : "w");
-		    if (fwrite (patchedbuf, 1, patchedlen, e) != patchedlen)
+		    if (fwrite (patchedbuf, sizeof *patchedbuf, patchedlen, e)
+			!= patchedlen)
 			error (1, errno, "cannot write %s", temp_filename);
 		    if (fclose (e) == EOF)
 			error (1, errno, "cannot close %s", temp_filename);
@@ -2616,7 +2617,7 @@
     while ((nread = fread (line, 1, line_len, fp)) > 0)
     {
 	p = line;
-	while ((nwritten = fwrite (p, 1, nread, newf)) > 0)
+	while ((nwritten = fwrite (p, sizeof *p, nread, newf)) > 0)
 	{
 	    nread -= nwritten;
 	    p += nwritten;
@@ -2822,7 +2823,7 @@
     s = select (STDOUT_FILENO+1, NULL, &wfds, NULL, NULL);
     if (s < 1 && errno != 0)
         perror ("cannot write to stdout");
-    fwrite (args, len, sizeof (*args), stdout);
+    fwrite (args, sizeof *args, len, stdout);
     putc ('\n', stdout);
 }
 
@@ -2885,7 +2886,7 @@
      */
     if (s < 1 && errno != 0)
         fperrmsg (stdout, 1, errno, "cannot write to stderr");
-    fwrite (args, len, sizeof (*args), stderr);
+    fwrite (args, sizeof *args, len, stderr);
     putc ('\n', stderr);
 }