averello/macvim-mirror
1
0
Fork 0
mirror of https://github.com/macvim-dev/macvim.git synced 2026-06-11 15:37:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use -[NSString vimStringSave]

Browse Source
This commit is contained in:
Bjorn Winckler
2008-09-24 20:19:24 +02:00
parent ae2eb1cf48
commit 0b018a5836
2 changed files with 6 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/MacVim/MMBackend.m
+4 -26
View File
@@ -695,16 +695,8 @@ static NSString *MMSymlinkWarningString =
[self waitForDialogReturn];
if (dialogReturn && [dialogReturn isKindOfClass:[NSString class]]) {
char_u *ret = (char_u*)[dialogReturn UTF8String];
#ifdef FEAT_MBYTE
ret = CONVERT_FROM_UTF8(ret);
#endif
s = vim_strsave(ret);
#ifdef FEAT_MBYTE
CONVERT_FROM_UTF8_FREE(ret);
#endif
}
if (dialogReturn && [dialogReturn isKindOfClass:[NSString class]])
s = [dialogReturn vimStringSave];
[dialogReturn release]; dialogReturn = nil;
}
@@ -1241,15 +1233,8 @@ static NSString *MMSymlinkWarningString =
//[svrConn setReplyTimeout:MMReplyTimeout];
[svrConn setRootObject:self];
char_u *s = (char_u*)[svrName UTF8String];
#ifdef FEAT_MBYTE
s = CONVERT_FROM_UTF8(s);
#endif
// NOTE: 'serverName' is a global variable
serverName = vim_strsave(s);
#ifdef FEAT_MBYTE
CONVERT_FROM_UTF8_FREE(s);
#endif
serverName = [svrName vimStringSave];
#ifdef FEAT_EVAL
set_vim_var_string(VV_SEND_SERVER, serverName, -1);
#endif
@@ -1301,14 +1286,7 @@ static NSString *MMSymlinkWarningString =
NSString *eval = [proxy evaluateExpression:string client:self];
if (reply) {
if (eval) {
char_u *r = (char_u*)[eval UTF8String];
#ifdef FEAT_MBYTE
r = CONVERT_FROM_UTF8(r);
#endif
*reply = vim_strsave(r);
#ifdef FEAT_MBYTE
CONVERT_FROM_UTF8_FREE(r);
#endif
*reply = [eval vimStringSave];
} else {
*reply = vim_strsave((char_u*)_(e_invexprmsg));
}
src/MacVim/gui_macvim.m
+2 -16
View File
@@ -1750,14 +1750,7 @@ serverGetVimNames(void)
if (list) {
NSString *string = [list componentsJoinedByString:@"\n"];
char_u *s = (char_u*)[string UTF8String];
#ifdef FEAT_MBYTE
s = CONVERT_FROM_UTF8(s);
#endif
names = vim_strsave(s);
#ifdef FEAT_MBYTE
CONVERT_FROM_UTF8_FREE(s);
#endif
names = [string vimStringSave];
}
return names;
@@ -1825,14 +1818,7 @@ serverReadReply(int port, char_u **str)
{
NSString *reply = [[MMBackend sharedInstance] waitForReplyOnPort:port];
if (reply && str) {
char_u *s = (char_u*)[reply UTF8String];
#ifdef FEAT_MBYTE
s = CONVERT_FROM_UTF8(s);
#endif
*str = vim_strsave(s);
#ifdef FEAT_MBYTE
CONVERT_FROM_UTF8_FREE(s);
#endif
*str = [reply vimStringSave];
return 0;
}