diff src/esd.c @ 1261:465bd3c7d932

[xemacs-hg @ 2003-02-06 06:35:47 by ben] various bug fixes mule/cyril-util.el: Fix compile warning. loadup.el, make-docfile.el, update-elc-2.el, update-elc.el: Set stack-trace-on-error, load-always-display-messages so we get better debug results. update-elc-2.el: Fix typo in name of lisp/mule, leading to compile failure. simple.el: Omit M-S-home/end from motion keys. update-elc.el: Overhaul: -- allow list of "early-compile" files to be specified, not hardcoded -- fix autoload checking to include all .el files, not just dumped ones -- be smarter about regenerating autoloads, so we don't need to use loadup-el if not necessary -- use standard methods for loading/not loading auto-autoloads.el (maybe fixes "Already loaded" error?) -- rename misleading NOBYTECOMPILE flag file. window-xemacs.el: Fix bug in default param. window-xemacs.el: Fix compile warnings. lwlib-Xm.c: Fix compile warning. lispref/mule.texi: Lots of Mule rewriting. internals/internals.texi: Major fixup. Correct for new names of Bytebpos, Ichar, etc. and lots of Mule rewriting. config.inc.samp: Various fixups. Makefile.in.in: NOBYTECOMPILE -> BYTECOMPILE_CHANGE. esd.c: Warning fixes. fns.c: Eliminate bogus require-prints-loading-message; use already existent load-always-display-messages instead. Make sure `load' knows we are coming from `require'. lread.c: Turn on `load-warn-when-source-newer' by default. Change loading message to indicate when we are `require'ing. Eliminate purify_flag hacks to display more messages; instead, loadup and friends specify this explicitly with `load-always-display-messages'. Add spaces when batch to clearly indicate recursive loading. Fassoc() does not GC so no need to gcpro. gui-x.c, gui-x.h, menubar-x.c: Fix up crashes when selecting menubar items due to lack of GCPROing of callbacks in lwlib structures. eval.c, lisp.h, print.c: Don't canonicalize to selected-frame when noninteractive, or backtraces get all screwed up as some values are printed through the stream console and some aren't. Export canonicalize_printcharfun() and use in Fbacktrace().
author ben
date Thu, 06 Feb 2003 06:36:17 +0000
parents 13e3d7ae7155
children 04bc9d2f42c7
line wrap: on
line diff
--- a/src/esd.c	Wed Feb 05 22:53:04 2003 +0000
+++ b/src/esd.c	Thu Feb 06 06:36:17 2003 +0000
@@ -51,8 +51,7 @@
   fmtType        ffmt;
   int            fmt,speed,tracks;
   unsigned char *pptr,*optr,*cptr,*sptr;
-  ssize_t        wrtn;
-  size_t         crtn;
+  Bytecount      wrtn, crtn;
   size_t         prtn;
   int flags, sock;
 
@@ -116,18 +115,21 @@
   for (pptr = data; (prtn = parsesndfile((void **)&pptr,&length,
                                         (void **)&optr)) > 0; )
     for (cptr = optr; (crtn = sndcnv((void **)&cptr,&prtn,
-                                    (void **)&sptr)) > 0; ) {
-      if ((wrtn = write(sock,sptr,crtn)) < 0) {
-	sound_perror ("write error");
-       goto END_OF_PLAY;
+                                    (void **)&sptr)) > 0; )
+      {
+	if ((wrtn = write(sock,sptr,crtn)) < 0)
+	  {
+	    sound_perror ("write error");
+	    goto END_OF_PLAY;
+	  }
+	if (wrtn != crtn)
+	  {
+	    Extbyte warn_buf[255];
+	    sprintf (warn_buf, "only wrote %ld of %ld bytes", wrtn, crtn);
+	    sound_warn (warn_buf);
+	    goto END_OF_PLAY;
+	  }
       }
-      if (wrtn != crtn) {
-	Extbyte warn_buf[255];
-	sprintf (warn_buf , "only wrote %d of %d bytes", wrtn, crtn);
-	sound_warn (warn_buf);
-       goto END_OF_PLAY;
-      }
-    }
 
   if (ffmt == fmtWave)
     parse_wave_complete();