nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-16 03:53:01 -05:00
Code Issues Projects Releases Wiki Activity

Carbonise, mostly by replacing addresource() with c2pstrcpy() and

Browse Source 
AddResource(), and similar.

[originally from svn r2775]
This commit is contained in:
Ben Harris 2003-02-02 00:04:36 +00:00
parent e68c510ac4
commit 49552525cc
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
mac/macstore.c
View File

@ -1,4 +1,4 @@
/* $Id: macstore.c,v 1.15 2003/02/01 21:44:05 ben Exp $ */ /* $Id: macstore.c,v 1.16 2003/02/02 00:04:36 ben Exp $ */
/* /*
* macstore.c: Macintosh-specific impementation of the interface * macstore.c: Macintosh-specific impementation of the interface
@ -183,6 +183,7 @@ void write_setting_s(void *handle, char const *key, char const *value) {
Handle h; Handle h;
int id; int id;
OSErr error; OSErr error;
Str255 pkey;
UseResFile(fd); UseResFile(fd);
if (ResError() != noErr) if (ResError() != noErr)
@ -195,7 +196,8 @@ void write_setting_s(void *handle, char const *key, char const *value) {
id = Unique1ID(FOUR_CHAR_CODE('TEXT')); id = Unique1ID(FOUR_CHAR_CODE('TEXT'));
if (ResError() != noErr) if (ResError() != noErr)
fatalbox("Failed to get ID for resource %s (%d)", key, ResError()); fatalbox("Failed to get ID for resource %s (%d)", key, ResError());
addresource(h, FOUR_CHAR_CODE('TEXT'), id, key); c2pstrcpy(pkey, key);
AddResource(h, FOUR_CHAR_CODE('TEXT'), id, pkey);
if (ResError() != noErr) if (ResError() != noErr)
fatalbox("Failed to add resource %s (%d)", key, ResError()); fatalbox("Failed to add resource %s (%d)", key, ResError());
} }
@ -205,6 +207,7 @@ void write_setting_i(void *handle, char const *key, int value) {
Handle h; Handle h;
int id; int id;
OSErr error; OSErr error;
Str255 pkey;
UseResFile(fd); UseResFile(fd);
if (ResError() != noErr) if (ResError() != noErr)
@ -219,7 +222,8 @@ void write_setting_i(void *handle, char const *key, int value) {
id = Unique1ID(FOUR_CHAR_CODE('Int ')); id = Unique1ID(FOUR_CHAR_CODE('Int '));
if (ResError() != noErr) if (ResError() != noErr)
fatalbox("Failed to get ID for resource %s (%d)", key, ResError()); fatalbox("Failed to get ID for resource %s (%d)", key, ResError());
addresource(h, FOUR_CHAR_CODE('Int '), id, key); c2pstrcpy(pkey, key);
AddResource(h, FOUR_CHAR_CODE('Int '), id, pkey);
if (ResError() != noErr) if (ResError() != noErr)
fatalbox("Failed to add resource %s (%d)", key, ResError()); fatalbox("Failed to add resource %s (%d)", key, ResError());
} }
@ -270,7 +274,7 @@ void *open_settings_r_fsp(FSSpec *sessfile)
fd = FSpOpenResFile(sessfile, fsRdPerm); fd = FSpOpenResFile(sessfile, fsRdPerm);
if (fd == 0) {error = ResError(); goto out;} if (fd == 0) {error = ResError(); goto out;}
handle = safemalloc(sizeof *handle); handle = smalloc(sizeof *handle);
*handle = fd; *handle = fd;
return handle; return handle;
@ -282,12 +286,14 @@ char *read_setting_s(void *handle, char const *key, char *buffer, int buflen) {
int fd; int fd;
Handle h; Handle h;
size_t len; size_t len;
Str255 pkey;
if (handle == NULL) goto out; if (handle == NULL) goto out;
fd = *(int *)handle; fd = *(int *)handle;
UseResFile(fd); UseResFile(fd);
if (ResError() != noErr) goto out; if (ResError() != noErr) goto out;
h = get1namedresource(FOUR_CHAR_CODE('TEXT'), key); c2pstrcpy(pkey, key);
h = Get1NamedResource(FOUR_CHAR_CODE('TEXT'), pkey);
if (h == NULL) goto out; if (h == NULL) goto out;
len = GetHandleSize(h); len = GetHandleSize(h);
@ -307,12 +313,14 @@ int read_setting_i(void *handle, char const *key, int defvalue) {
int fd; int fd;
Handle h; Handle h;
int value; int value;
Str255 pkey;
if (handle == NULL) goto out; if (handle == NULL) goto out;
fd = *(int *)handle; fd = *(int *)handle;
UseResFile(fd); UseResFile(fd);
if (ResError() != noErr) goto out; if (ResError() != noErr) goto out;
h = get1namedresource(FOUR_CHAR_CODE('Int '), key); c2pstrcpy(pkey, key);
h = Get1NamedResource(FOUR_CHAR_CODE('Int '), pkey);
if (h == NULL) goto out; if (h == NULL) goto out;
value = *(int *)*h; value = *(int *)*h;
ReleaseResource(h); ReleaseResource(h);
@ -358,18 +366,20 @@ void write_setting_fontspec(void *handle, const char *name, FontSpec font)
sfree(settingname); sfree(settingname);
} }
int read_setting_filename(void *handle, const char *name, Filename *result) int read_setting_filename(void *handle, const char *key, Filename *result)
{ {
int fd; int fd;
AliasHandle h; AliasHandle h;
Boolean changed; Boolean changed;
OSErr err; OSErr err;
Str255 pkey;
if (handle == NULL) goto out; if (handle == NULL) goto out;
fd = *(int *)handle; fd = *(int *)handle;
UseResFile(fd); UseResFile(fd);
if (ResError() != noErr) goto out; if (ResError() != noErr) goto out;
h = (AliasHandle)get1namedresource(rAliasType, name); c2pstrcpy(pkey, key);
h = (AliasHandle)Get1NamedResource(rAliasType, pkey);
if (h == NULL) goto out; if (h == NULL) goto out;
if ((*h)->userType == 'pTTY' && (*h)->aliasSize == sizeof(**h)) if ((*h)->userType == 'pTTY' && (*h)->aliasSize == sizeof(**h))
memset(result, 0, sizeof(*result)); memset(result, 0, sizeof(*result));
@ -397,12 +407,13 @@ int read_setting_filename(void *handle, const char *name, Filename *result)
return 0; return 0;
} }
void write_setting_filename(void *handle, const char *name, Filename fn) void write_setting_filename(void *handle, const char *key, Filename fn)
{ {
int fd = *(int *)handle; int fd = *(int *)handle;
AliasHandle h; AliasHandle h;
int id; int id;
OSErr error; OSErr error;
Str255 pkey;
UseResFile(fd); UseResFile(fd);
if (ResError() != noErr) if (ResError() != noErr)
@ -442,10 +453,11 @@ void write_setting_filename(void *handle, const char *name, Filename fn)
/* Put the data in a resource. */ /* Put the data in a resource. */
id = Unique1ID(rAliasType); id = Unique1ID(rAliasType);
if (ResError() != noErr) if (ResError() != noErr)
fatalbox("Failed to get ID for resource %s (%d)", name, ResError()); fatalbox("Failed to get ID for resource %s (%d)", key, ResError());
addresource((Handle)h, rAliasType, id, name); c2pstrcpy(pkey, key);
AddResource((Handle)h, rAliasType, id, pkey);
if (ResError() != noErr) if (ResError() != noErr)
fatalbox("Failed to add resource %s (%d)", name, ResError()); fatalbox("Failed to add resource %s (%d)", key, ResError());
} }
void close_settings_r(void *handle) { void close_settings_r(void *handle) {
@ -456,7 +468,7 @@ void close_settings_r(void *handle) {
CloseResFile(fd); CloseResFile(fd);
if (ResError() != noErr) if (ResError() != noErr)
fatalbox("Close of saved session failed (%d)", ResError()); fatalbox("Close of saved session failed (%d)", ResError());
safefree(handle); sfree(handle);
} }
void del_settings(char const *sessionname) { void del_settings(char const *sessionname) {