| 1 |
diff -ruN Canna37p3.orig/cmd/crxgram/crxgram.c Canna37p3/cmd/crxgram/crxgram.c
|
| 2 |
--- Canna37p3.orig/cmd/crxgram/crxgram.c 2003-03-24 13:04:25.000000000 +0900
|
| 3 |
+++ Canna37p3/cmd/crxgram/crxgram.c 2005-03-02 17:15:28.000000000 +0900
|
| 4 |
@@ -485,7 +485,7 @@
|
| 5 |
int j;
|
| 6 |
|
| 7 |
nextS = scanToken(nextS, namevec, sizeof(namevec));
|
| 8 |
- name = strtok(namevec, SEP);
|
| 9 |
+ name = strtok((char *)namevec, SEP);
|
| 10 |
for (j = 0; name && j < 255;) {
|
| 11 |
if (r = probeIdent(Row, name))
|
| 12 |
rdata[i][j++] = r->rownum;
|
| 13 |
diff -ruN Canna37p3.orig/cmd/cshost/cshost.c Canna37p3/cmd/cshost/cshost.c
|
| 14 |
--- Canna37p3.orig/cmd/cshost/cshost.c 2003-12-28 02:15:22.000000000 +0900
|
| 15 |
+++ Canna37p3/cmd/cshost/cshost.c 2005-03-02 17:15:28.000000000 +0900
|
| 16 |
@@ -152,12 +152,12 @@
|
| 17 |
goto protoerr;
|
| 18 |
assert(wp + 2 <= endp);
|
| 19 |
printf("HOST NAME:%s\n", wp ) ;
|
| 20 |
- wp += strlen( wp ) + 1 ;
|
| 21 |
+ wp += strlen((char *) wp ) + 1 ;
|
| 22 |
if( *wp ) {
|
| 23 |
printf("USER NAME:" ) ;
|
| 24 |
while( *wp ) {
|
| 25 |
printf("%s ", wp ) ;
|
| 26 |
- wp += strlen( wp ) + 1 ;
|
| 27 |
+ wp += strlen((char *) wp ) + 1 ;
|
| 28 |
}
|
| 29 |
} else
|
| 30 |
printf("ALL USER" ) ;
|
| 31 |
diff -ruN Canna37p3.orig/cmd/wtoc/wtoc.c Canna37p3/cmd/wtoc/wtoc.c
|
| 32 |
--- Canna37p3.orig/cmd/wtoc/wtoc.c 2003-12-28 02:15:23.000000000 +0900
|
| 33 |
+++ Canna37p3/cmd/wtoc/wtoc.c 2005-03-02 17:15:28.000000000 +0900
|
| 34 |
@@ -144,8 +144,8 @@
|
| 35 |
int hindo;
|
| 36 |
{
|
| 37 |
if( !strcmp((char *)hinshi,"#kxuru") || !strcmp((char *)hinshi,"#sxuru")){
|
| 38 |
- strcat(yomi,"¤ë");
|
| 39 |
- strcat(kouho,"¤ë");
|
| 40 |
+ strcat((char *)yomi,"¤ë");
|
| 41 |
+ strcat((char *)kouho,"¤ë");
|
| 42 |
}
|
| 43 |
if( hindo == 0 )
|
| 44 |
fprintf( fp, "%s %s %s \n", yomi, hinshi, kouho );
|
| 45 |
diff -ruN Canna37p3.orig/lib/canna/ebind.c Canna37p3/lib/canna/ebind.c
|
| 46 |
--- Canna37p3.orig/lib/canna/ebind.c 2003-09-17 17:50:53.000000000 +0900
|
| 47 |
+++ Canna37p3/lib/canna/ebind.c 2005-03-02 17:15:28.000000000 +0900
|
| 48 |
@@ -364,7 +364,7 @@
|
| 49 |
/* list_cb¤ÏKC_setListCallback¤Çd->elistcb¤Ë°ú¤Ã±Û¤¹ */
|
| 50 |
list_cb.client_data = (char *)arg;
|
| 51 |
list_cb.callback_func = &EUCListCallback;
|
| 52 |
- ret = XwcKanjiControl2(display, window, request, (char *)&list_cb);
|
| 53 |
+ ret = XwcKanjiControl2(display, window, request, (BYTE *)&list_cb);
|
| 54 |
goto return_ret;
|
| 55 |
/* FALLTHROUGH */
|
| 56 |
default: /* ¥ï¥¤¥É¤Ç¤âEUC¤Ç¤âÊѤï¤é¤Ê¤¤¤â¤Î */
|
| 57 |
diff -ruN Canna37p3.orig/lib/canna/obind.c Canna37p3/lib/canna/obind.c
|
| 58 |
--- Canna37p3.orig/lib/canna/obind.c 2004-04-27 07:49:21.000000000 +0900
|
| 59 |
+++ Canna37p3/lib/canna/obind.c 2005-03-02 17:15:28.000000000 +0900
|
| 60 |
@@ -500,7 +500,7 @@
|
| 61 |
/* list_cb¤ÏKC_setListCallback¤Çd->elistcb¤Ë°ú¤Ã±Û¤¹ */
|
| 62 |
list_cb.client_data = (char *)arg;
|
| 63 |
list_cb.callback_func = &owcListCallback;
|
| 64 |
- ret = XwcKanjiControl2(display, window, request, (char *)&list_cb);
|
| 65 |
+ ret = XwcKanjiControl2(display, window, request, (BYTE *)&list_cb);
|
| 66 |
goto return_ret;
|
| 67 |
default: /* ¿·¥ï¥¤¥É¤ÈÊѤï¤é¤Ê¤¤¤â¤Î */
|
| 68 |
ret = XwcKanjiControl2(display, window, request, arg);
|
| 69 |
diff -ruN Canna37p3.orig/server/convert.c Canna37p3/server/convert.c
|
| 70 |
--- Canna37p3.orig/server/convert.c 2003-12-28 02:15:24.000000000 +0900
|
| 71 |
+++ Canna37p3/server/convert.c 2005-03-02 17:15:28.000000000 +0900
|
| 72 |
@@ -1506,7 +1506,7 @@
|
| 73 |
const char *username;
|
| 74 |
const char *hostname;
|
| 75 |
{
|
| 76 |
- int (*ReqCallFunc) pro((char *, int)) ;
|
| 77 |
+ int (*ReqCallFunc) pro((BYTE *, int)) ;
|
| 78 |
register Req0 *req0 = &Request.Request0 ;
|
| 79 |
const char *username0 = username ? username : "";
|
| 80 |
const char *hostname0 = hostname ? hostname : "";
|
| 81 |
diff -ruN Canna37p3.orig/server/wconvert.c Canna37p3/server/wconvert.c
|
| 82 |
--- Canna37p3.orig/server/wconvert.c 2005-03-02 17:15:05.000000000 +0900
|
| 83 |
+++ Canna37p3/server/wconvert.c 2005-03-02 17:15:28.000000000 +0900
|
| 84 |
@@ -189,7 +189,7 @@
|
| 85 |
size_t size;
|
| 86 |
{
|
| 87 |
ir_debug( Dmsg(10, "WriteClient:") );
|
| 88 |
- ir_debug( DebugDump( 10, buf, size ) );
|
| 89 |
+ ir_debug( DebugDump( 10, (const char *)buf, size ) );
|
| 90 |
return ClientBuf_store_reply(client->client_buf, buf, size);
|
| 91 |
}
|
| 92 |
#else
|
| 93 |
@@ -1372,8 +1372,8 @@
|
| 94 |
/* °Ê²¼¡¢¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤Î¥Á¥§¥Ã¥¯ */
|
| 95 |
stat = ACCES;
|
| 96 |
if (checkPermissionToRead(client, dirname, (char *)0) >= 0) {
|
| 97 |
- stat = RkwListDic(cxnum, (unsigned char *)dirname,
|
| 98 |
- (unsigned char *)dicnames, requestsize);
|
| 99 |
+ stat = RkwListDic(cxnum, (char *)dirname,
|
| 100 |
+ (char *)dicnames, requestsize);
|
| 101 |
}
|
| 102 |
|
| 103 |
listdicdone:
|
| 104 |
@@ -1403,7 +1403,7 @@
|
| 105 |
ir_debug( Dmsg(5, "dicname = %s\n",
|
| 106 |
(req->dicname)?req->dicname:null) );
|
| 107 |
|
| 108 |
- stat = (char)RkwCreateDic(cxnum, (unsigned char *)req->dicname,
|
| 109 |
+ stat = (char)RkwCreateDic(cxnum, (char *)req->dicname,
|
| 110 |
req->mode);
|
| 111 |
}
|
| 112 |
|
| 113 |
@@ -1438,7 +1438,7 @@
|
| 114 |
ir_debug( Dmsg(5, "dicname = %s\n",
|
| 115 |
(req->dicname)?req->dicname:null) );
|
| 116 |
|
| 117 |
- stat = (char)RkwRemoveDic(cxnum, (unsigned char *)req->dicname,
|
| 118 |
+ stat = (char)RkwRemoveDic(cxnum, (char *)req->dicname,
|
| 119 |
req->mode);
|
| 120 |
}
|
| 121 |
|
| 122 |
@@ -1456,8 +1456,8 @@
|
| 123 |
|
| 124 |
if (validcontext(cxnum, client, wRenameDictionary)) {
|
| 125 |
diclen = strlen(req->dicname) + 1 ;
|
| 126 |
- stat = RkwRenameDic(cxnum, (unsigned char *)req->dicname,
|
| 127 |
- (unsigned char *)&(req->dicname)[diclen],
|
| 128 |
+ stat = RkwRenameDic(cxnum, (char *)req->dicname,
|
| 129 |
+ (char *)&(req->dicname)[diclen],
|
| 130 |
req->mode);
|
| 131 |
}
|
| 132 |
return SendType2Reply(client, wRenameDictionary, EXTPROTO, stat);
|
| 133 |
@@ -1950,8 +1950,8 @@
|
| 134 |
ir_debug( Dmsg(5, "dicname = %s\n", Request.type15.dicname) );
|
| 135 |
ir_debug( Dmsg(5, "username = %s\n", username) );
|
| 136 |
|
| 137 |
- stat = (RkwQueryDic(cxnum, (unsigned char *)username,
|
| 138 |
- (unsigned char *)Request.type15.dicname,
|
| 139 |
+ stat = (RkwQueryDic(cxnum, (char *)username,
|
| 140 |
+ (char *)Request.type15.dicname,
|
| 141 |
dicinfo) < 0) ? -1 : 0;
|
| 142 |
|
| 143 |
if (stat < 0) {
|
Parent Directory
| 
Revision Log