[Scsh-checkins] CVS: scx/c/xlib pixmap.c,1.5,1.6 text.c,1.5,1.6

[David Frese <frese@users.sourceforge.net>]

Update of /cvsroot/scsh/scx/c/xlib
In directory usw-pr-cvs1:/tmp/cvs-serv3795

Modified Files:
        pixmap.c text.c 
Log Message:
fixed some typos.


Index: pixmap.c
===================================================================
RCS file: /cvsroot/scsh/scx/c/xlib/pixmap.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** pixmap.c    2001/07/31 14:51:21     1.5
--- pixmap.c    2001/08/22 11:56:46     1.6
***************
*** 52,61 ****
    S48_DECLARE_GC_PROTECT(1);
    // Not used: Disable_Interrupts;
!   res = XReadBitmapFile (SCX_EXTRACT_DISPLAY(Xdisplay), 
SCX_EXTRACT_DRAWABLE(Xdrawable),
                         s48_extract_string(file), &width, &height, &bitmap,
                         &xhot, &yhot);
    // Not used: Enable_Interrupts;
    if (res != BitmapSuccess){
!     return Bits_To_Symbols ((unsigned long)ret, Bitmapstatus_Syms);
    }
    S48_GC_PROTECT_1 (ret);
--- 52,62 ----
    S48_DECLARE_GC_PROTECT(1);
    // Not used: Disable_Interrupts;
!   res = XReadBitmapFile (SCX_EXTRACT_DISPLAY(Xdisplay), 
!                        SCX_EXTRACT_DRAWABLE(Xdrawable),
                         s48_extract_string(file), &width, &height, &bitmap,
                         &xhot, &yhot);
    // Not used: Enable_Interrupts;
    if (res != BitmapSuccess){
!     return Bit_To_Symbol ((unsigned long)ret, Bitmapstatus_Syms);
    }
    S48_GC_PROTECT_1 (ret);
***************
*** 84,88 ****
                          (int)s48_extract_integer(y));
    //  Enable_Interrupts;
!   return Bits_To_Symbols ((unsigned long)ret, Bitmapstatus_Syms);
  }
  
--- 85,89 ----
                          (int)s48_extract_integer(y));
    //  Enable_Interrupts;
!   return Bit_To_Symbol ((unsigned long)ret, Bitmapstatus_Syms);
  }
  

Index: text.c
===================================================================
RCS file: /cvsroot/scsh/scx/c/xlib/text.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** text.c      2001/08/21 08:19:02     1.5
--- text.c      2001/08/22 11:56:46     1.6
***************
*** 142,146 ****
        item[set].nchars = k;
        if (twobyte) {
!         XChar2b* s2 = malloc(sizeof(XChar2b)*k);
          for (j = 0; j < k; j++){
            tmp = (int)s48_extract_integer(S48_VECTOR_REF(temp_vec, j));
--- 142,146 ----
        item[set].nchars = k;
        if (twobyte) {
!         XChar2b* s2 = (XChar2b*)malloc(sizeof(XChar2b)*k);
          for (j = 0; j < k; j++){
            tmp = (int)s48_extract_integer(S48_VECTOR_REF(temp_vec, j));
***************
*** 150,154 ****
          (XTextItem16*)item[set].chars = s2;
        } else {
!         char* s = malloc(sizeof(char)*k);
          for (j = 0; j < k; j++) {
            s[j] = (int)s48_extract_integer(S48_VECTOR_REF(temp_vec, j));
--- 150,154 ----
          (XTextItem16*)item[set].chars = s2;
        } else {
!         char* s = (char*)malloc(sizeof(char)*k);
          for (j = 0; j < k; j++) {
            s[j] = (int)s48_extract_integer(S48_VECTOR_REF(temp_vec, j));