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