[PHP-DEV] CVS update: php3/functions From: shane (php-dev <email protected>)
Date: 01/29/99

Date: Friday January 29, 1999 @ 19:52
Author: shane

Update of /repository/php3/functions
In directory asf:/u/temp/cvs-serv11011/functions

Modified Files:
        iptc.c
Log Message:
some work on this abort stuff. I don't beleive that you can test for failures against stdout for cgi's. At least in my implementation, the script continues past my user abort. The user function for timeout is working now though, which is nice.
fixed some warnings in iptc

Index: php3/functions/iptc.c
diff -c php3/functions/iptc.c:1.15 php3/functions/iptc.c:1.16
*** php3/functions/iptc.c:1.15 Sat Jan 23 14:31:35 1999
--- php3/functions/iptc.c Fri Jan 29 19:52:21 1999
***************
*** 27,33 ****
     +----------------------------------------------------------------------+
   */
  
! /* $Id: iptc.c,v 1.15 1999/01/23 19:31:35 eschmid Exp $ */
  
  /*
   * Functions to parse & compse IPTC data.
--- 27,33 ----
     +----------------------------------------------------------------------+
   */
  
! /* $Id: iptc.c,v 1.16 1999/01/30 00:52:21 shane Exp $ */
  
  /*
   * Functions to parse & compse IPTC data.
***************
*** 103,109 ****
  
          if (c == EOF) return EOF;
  
! if (spool > 0) PUTC(c);
  
          if (spoolbuf) *(*spoolbuf)++ = c;
  
--- 103,109 ----
  
          if (c == EOF) return EOF;
  
! if (spool > 0) PUTC((char)c);
  
          if (spoolbuf) *(*spoolbuf)++ = c;
  
***************
*** 160,166 ****
              return M_EOI; /* we hit EOF */
                  else
                  if (c == 0xff)
! php3_iptc_put1(fp,spool,c,spoolbuf);
      } while (c == 0xff);
  
      return (unsigned int) c;
--- 160,166 ----
              return M_EOI; /* we hit EOF */
                  else
                  if (c == 0xff)
! php3_iptc_put1(fp,spool,(unsigned char)c,spoolbuf);
      } while (c == 0xff);
  
      return (unsigned int) c;
***************
*** 250,256 ****
                  if (marker == M_EOI) { /* EOF */
                          break;
                  } else if (marker != M_APP13) {
! php3_iptc_put1(fp,spool,marker,poi?&poi:0);
                  }
  
                  switch (marker) {
--- 250,256 ----
                  if (marker == M_EOI) { /* EOF */
                          break;
                  } else if (marker != M_APP13) {
! php3_iptc_put1(fp,spool,(unsigned char)marker,poi?&poi:0);
                  }
  
                  switch (marker) {
***************
*** 273,280 ****
                                  for (inx = 0; inx < 28; inx++)
                                          php3_iptc_put1(fp,spool,psheader[inx],poi?&poi:0);
  
! php3_iptc_put1(fp,spool,len>>8,poi?&poi:0);
! php3_iptc_put1(fp,spool,len&0xff,poi?&poi:0);
                                          
                                  for (inx = 0; inx < len; inx++)
                                          php3_iptc_put1(fp,spool,iptcdata->value.str.val[inx],poi?&poi:0);
--- 273,280 ----
                                  for (inx = 0; inx < 28; inx++)
                                          php3_iptc_put1(fp,spool,psheader[inx],poi?&poi:0);
  
! php3_iptc_put1(fp,spool,(unsigned char)(len>>8),poi?&poi:0);
! php3_iptc_put1(fp,spool,(unsigned char)(len&0xff),poi?&poi:0);
                                          
                                  for (inx = 0; inx < len; inx++)
                                          php3_iptc_put1(fp,spool,iptcdata->value.str.val[inx],poi?&poi:0); 

--
PHP Development Mailing List   http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe <email protected>
For help: php-dev-help <email protected>