d4x/d4x-fix-gcc44.patch

   1 diff -ruN d4x.orig/main/face/edit.cc d4x.new/main/face/edit.cc
   2 --- d4x.orig/main/face/edit.cc  2009-05-29 02:35:26.000000000 -0700
   3 +++ d4x.new/main/face/edit.cc   2009-05-29 02:33:45.000000000 -0700
   4 @@ -1450,7 +1450,7 @@
   5
   6  static void _proxy_port_changed_(GtkEntry *entry,GtkEntry *entryh){
   7         const char *tmp=gtk_entry_get_text(entryh);
   8 -       char *tmp1=index(tmp,':');
   9 +       char *tmp1 = (char *) index(tmp,':');
  10         if (tmp1){
  11                 *tmp1=0;
  12                 char *ns=sum_strings(tmp,":",gtk_entry_get_text(entry),NULL);
  13 diff -ruN d4x.orig/main/ftp.cc d4x.new/main/ftp.cc
  14 --- d4x.orig/main/ftp.cc        2009-05-29 02:35:02.000000000 -0700
  15 +++ d4x.new/main/ftp.cc 2009-05-29 02:32:41.000000000 -0700
  16 @@ -261,7 +261,7 @@
  17  };
  18
  19  static void d4x_ftp_parse_pasv(const char *str,int args[]){
  20 -       char *a=index(str,'(');
  21 +       char *a = (char *) index(str,'(');
  22         if (a==NULL) return;
  23         a+=1;
  24         int i=0;
  25 diff -ruN d4x.orig/main/html.cc d4x.new/main/html.cc
  26 --- d4x.orig/main/html.cc       2009-05-29 02:35:09.000000000 -0700
  27 +++ d4x.new/main/html.cc        2009-05-29 02:33:55.000000000 -0700
  28 @@ -700,7 +700,7 @@
  29
  30  void tHtmlParser::set_content_type(const char *ct){
  31         //Example: text/html; charset=koi8-r
  32 -       char *a=index(ct,'=');
  33 +       const char *a=index(ct,'=');
  34         if (a) codepage=a+1;
  35  };
  36
  37 diff -ruN d4x.orig/main/locstr.cc d4x.new/main/locstr.cc
  38 --- d4x.orig/main/locstr.cc     2009-05-29 02:35:14.000000000 -0700
  39 +++ d4x.new/main/locstr.cc      2009-05-29 02:32:47.000000000 -0700
  40 @@ -281,7 +281,7 @@
  41         DBC_RETVAL_IF_FAIL(str!=NULL,NULL);
  42         DBC_RETVAL_IF_FAIL(what!=NULL,NULL);
  43         while (*str){
  44 -               char *a=index(what,*str);
  45 +               const char *a=index(what,*str);
  46                 if (a) return(str);
  47                 str++;
  48         };
  49 @@ -472,16 +472,16 @@
  50  char *escape_char(const char *where,char what,char bywhat){
  51         DBC_RETVAL_IF_FAIL(where!=NULL,NULL);
  52         int num=0;
  53 -       char *tmp=index(where,what);
  54 +       char *tmp = (char *) index(where,what);
  55         while(tmp){
  56                 num+=1;
  57 -               tmp=index(tmp+1,what);
  58 +               tmp = (char *) index(tmp+1,what);
  59         };
  60         if (num){
  61                 char *rvalue=new char[strlen(where)+num*2+1];
  62                 *rvalue=0;
  63                 char *r=rvalue;
  64 -               tmp=index(where,what);
  65 +               tmp = (char *) index(where,what);
  66                 while(tmp){
  67                         if (tmp-where)
  68                                 memcpy(r,where,tmp-where);
  69 @@ -490,7 +490,7 @@
  70                         r[1]=what;
  71                         r+=2;
  72                         where=tmp+1;
  73 -                       tmp=index(where,what);
  74 +                       tmp = (char *) index(where,what);
  75                 };
  76                 *r=0;
  77                 if (*where)
  78 @@ -962,17 +962,17 @@
  79         DBC_RETVAL_IF_FAIL(a!=NULL,NULL);
  80         DBC_RETVAL_IF_FAIL(b!=NULL,NULL);
  81         int i=0;
  82 -       char *temp=index(b,'/');
  83 +       char *temp = (char *) index(b,'/');
  84         while (temp){
  85                 while (*temp=='/') temp+=1;
  86                 temp=index(temp,'/');
  87                 i+=1;
  88         };
  89         i-=1;
  90 -       temp=rindex(a,'/');
  91 +       temp = (char *) rindex(a,'/');
  92         while (temp && i>0){
  93                 *temp=0;
  94 -               char *tmp=rindex(a,'/');
  95 +               char *tmp = (char *) rindex(a,'/');
  96                 *temp='/';
  97                 temp=tmp;
  98                 i-=1;