Menu
▾
▴
SF.net SVN: frontierkernel: [1254] Frontier/trunk/Common/source
|
From: <set...@us...> - 2006-04-12 20:27:44
|
Revision: 1254 Author: sethdill Date: 2006-04-12 13:27:14 -0700 (Wed, 12 Apr 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1254&view=rev Log Message: ----------- Start of a fix for the pointer signedness issue. I'm down to 128 total warnings, which seems like the perfect time to stop! Modified Paths: -------------- Frontier/trunk/Common/IOAToolkit/ioabutton.c Frontier/trunk/Common/headers/claylinelayout.h Frontier/trunk/Common/headers/dialogs.h Frontier/trunk/Common/headers/frontierdefs.h Frontier/trunk/Common/headers/langinternal.h Frontier/trunk/Common/headers/stringdefs.h Frontier/trunk/Common/headers/versions.h Frontier/trunk/Common/source/OpenTransportNetEvents.c Frontier/trunk/Common/source/WinSockNetEvents.c Frontier/trunk/Common/source/about.c Frontier/trunk/Common/source/cancoon.c Frontier/trunk/Common/source/cancoonwindow.c Frontier/trunk/Common/source/claybrowserstruc.c Frontier/trunk/Common/source/claybrowservalidate.c Frontier/trunk/Common/source/claycallbacks.c Frontier/trunk/Common/source/claylinelayout.c Frontier/trunk/Common/source/command.c Frontier/trunk/Common/source/dockmenu.c Frontier/trunk/Common/source/filedialog.c Frontier/trunk/Common/source/filemp3.c Frontier/trunk/Common/source/fileops.c Frontier/trunk/Common/source/fileverbs.c Frontier/trunk/Common/source/font.c Frontier/trunk/Common/source/icon.c Frontier/trunk/Common/source/iso8859.c Frontier/trunk/Common/source/langcrypt.c Frontier/trunk/Common/source/langdate.c Frontier/trunk/Common/source/langdll.c Frontier/trunk/Common/source/langexternal.c Frontier/trunk/Common/source/langhtml.c Frontier/trunk/Common/source/langregexp.c Frontier/trunk/Common/source/langstartup.c Frontier/trunk/Common/source/langsystypes.c Frontier/trunk/Common/source/langverbs.c Frontier/trunk/Common/source/langxml.c Frontier/trunk/Common/source/oprefcon.c Frontier/trunk/Common/source/ops.c Frontier/trunk/Common/source/opverbs.c Frontier/trunk/Common/source/opxml.c Frontier/trunk/Common/source/pict.c Frontier/trunk/Common/source/player.c Frontier/trunk/Common/source/process.c Frontier/trunk/Common/source/progressbar.c Frontier/trunk/Common/source/quickdraw.c Frontier/trunk/Common/source/scripts.c Frontier/trunk/Common/source/shellmenu.c Frontier/trunk/Common/source/shellverbs.c Frontier/trunk/Common/source/shellwindow.c Frontier/trunk/Common/source/shellwindowverbs.c Frontier/trunk/Common/source/strings.c Frontier/trunk/Common/source/stringverbs.c Frontier/trunk/Common/source/tabledisplay.c Frontier/trunk/Common/source/tableexternal.c Frontier/trunk/Common/source/tableformats.c Frontier/trunk/Common/source/tableops.c Frontier/trunk/Common/source/tablepopup.c Frontier/trunk/Common/source/tablevalidate.c Frontier/trunk/Common/source/winregistry.c Frontier/trunk/Common/source/wpengine.c Modified: Frontier/trunk/Common/IOAToolkit/ioabutton.c =================================================================== --- Frontier/trunk/Common/IOAToolkit/ioabutton.c 2006-04-12 17:45:59 UTC (rev 1253) +++ Frontier/trunk/Common/IOAToolkit/ioabutton.c 2006-04-12 20:27:14 UTC (rev 1254) @@ -136,7 +136,7 @@ GetThemeFont (kThemePushButtonFont, smSystemScript, fontname, &fontsize, &fontstyle); - fontgetnumber (fontname, &idfont); + fontgetnumber (fontname, (short *)(&idfont)); pushstyle (geneva, 9, bold); Modified: Frontier/trunk/Common/headers/claylinelayout.h =================================================================== --- Frontier/trunk/Common/headers/claylinelayout.h 2006-04-12 17:45:59 UTC (rev 1253) +++ Frontier/trunk/Common/headers/claylinelayout.h 2006-04-12 20:27:14 UTC (rev 1254) @@ -79,24 +79,24 @@ } tycomputedlineinfo; -#define str_claydisplay ("\x0b" "claydisplay") -#define str_realicons ("\x09" "realicons") -#define str_filenamebold ("\x0c" "filenamebold") -#define str_includeline2 ("\x0c" "includeline2") -#define str_includedate ("\x0b" "includedate") -#define str_includeframe ("\x0c" "includeframe") -#define str_iconsize ("\x08" "iconsize") -#define str_fillcolor ("\x09" "fillcolor") -#define str_framecolor ("\x0a" "framecolor") -#define str_cursorcolor ("\x0b" "cursorcolor") -#define str_filenamecolor ("\x0d" "filenamecolor") -#define str_othertextcolor ("\x0e" "othertextcolor") -#define str_backcolor ("\x09" "backcolor") -#define str_statuscolor ("\x0b" "statuscolor") -#define str_filenamefont ("\x0c" "filenamefont") -#define str_othertextfont ("\x0d" "othertextfont") -#define str_filenamefontsize ("\x10" "filenamefontsize") -#define str_othertextfontsize ("\x11" "othertextfontsize") +#define str_claydisplay (BIGSTRING ("\x0b" "claydisplay")) +#define str_realicons (BIGSTRING ("\x09" "realicons")) +#define str_filenamebold (BIGSTRING ("\x0c" "filenamebold")) +#define str_includeline2 (BIGSTRING ("\x0c" "includeline2")) +#define str_includedate (BIGSTRING ("\x0b" "includedate")) +#define str_includeframe (BIGSTRING ("\x0c" "includeframe")) +#define str_iconsize (BIGSTRING ("\x08" "iconsize")) +#define str_fillcolor (BIGSTRING ("\x09" "fillcolor")) +#define str_framecolor (BIGSTRING ("\x0a" "framecolor")) +#define str_cursorcolor (BIGSTRING ("\x0b" "cursorcolor")) +#define str_filenamecolor (BIGSTRING ("\x0d" "filenamecolor")) +#define str_othertextcolor (BIGSTRING ("\x0e" "othertextcolor")) +#define str_backcolor (BIGSTRING ("\x09" "backcolor")) +#define str_statuscolor (BIGSTRING ("\x0b" "statuscolor")) +#define str_filenamefont (BIGSTRING ("\x0c" "filenamefont")) +#define str_othertextfont (BIGSTRING ("\x0d" "othertextfont")) +#define str_filenamefontsize (BIGSTRING ("\x10" "filenamefontsize")) +#define str_othertextfontsize (BIGSTRING ("\x11" "othertextfontsize")) extern void claybrowserinitdraw (void); @@ -146,4 +146,4 @@ #endif -#endif \ No newline at end of file +#endif Modified: Frontier/trunk/Common/headers/dialogs.h =================================================================== --- Frontier/trunk/Common/headers/dialogs.h 2006-04-12 17:45:59 UTC (rev 1253) +++ Frontier/trunk/Common/headers/dialogs.h 2006-04-12 20:27:14 UTC (rev 1254) @@ -96,15 +96,15 @@ /* dialog button text */ #ifdef MACVERSION - #define cancelbuttontext "\x06" "Cancel" - #define duplicatebuttontext "\x09" "Duplicate" - #define replacebuttontext "\x07" "Replace" + #define cancelbuttontext BIGSTRING ("\x06" "Cancel") + #define duplicatebuttontext BIGSTRING ("\x09" "Duplicate") + #define replacebuttontext BIGSTRING ("\x07" "Replace") #endif #ifdef WIN95VERSION - #define cancelbuttontext "\x07" "&Cancel" - #define duplicatebuttontext "\x0a" "&Duplicate" - #define replacebuttontext "\x08" "&Replace" + #define cancelbuttontext BIGSTRING ("\x07" "&Cancel") + #define duplicatebuttontext BIGSTRING ("\x0a" "&Duplicate") + #define replacebuttontext BIGSTRING ("\x08" "&Replace") #endif Modified: Frontier/trunk/Common/headers/frontierdefs.h =================================================================== --- Frontier/trunk/Common/headers/frontierdefs.h 2006-04-12 17:45:59 UTC (rev 1253) +++ Frontier/trunk/Common/headers/frontierdefs.h 2006-04-12 20:27:14 UTC (rev 1254) @@ -84,6 +84,9 @@ #undef fltracklocaladdresses /*2004-12-08 aradke: disable [buggy] code for tracking deleted local addresses*/ +#define BIGSTRING( s ) ( (unsigned char *)( s ) ) + + #ifdef MACVERSION #define macBirdRuntime 1 #undef appRunsCards /*for Applet Toolkit, Iowa Runtime is baked in*/ Modified: Frontier/trunk/Common/headers/langinternal.h =================================================================== --- Frontier/trunk/Common/headers/langinternal.h 2006-04-12 17:45:59 UTC (rev 1253) +++ Frontier/trunk/Common/headers/langinternal.h 2006-04-12 20:27:14 UTC (rev 1254) @@ -219,16 +219,16 @@ } tystackid; -#define machinePPC "\x07" "PowerPC" -#define machine68K "\x03" "68K" -#define machinex86 "\x03" "x86" +#define machinePPC BIGSTRING ("\x07" "PowerPC") +#define machine68K BIGSTRING ("\x03" "68K") +#define machinex86 BIGSTRING ("\x03" "x86") -#define osMacOS "\x05" "MacOS" -#define osWin95 "\x05" "Win95" -#define osWinNT "\x05" "WinNT" +#define osMacOS BIGSTRING ("\x05" "MacOS") +#define osWin95 BIGSTRING ("\x05" "Win95") +#define osWinNT BIGSTRING ("\x05" "WinNT") //Code change by Timothy Paustian Tuesday, July 11, 2000 9:42:50 PM //Add a const to return for the carbon OS -#define osCarbon "\x05" "MacCn" +#define osCarbon BIGSTRING ("\x05" "MacCn") typedef boolean (*langtreevisitcallback) (hdltreenode, ptrvoid); Modified: Frontier/trunk/Common/headers/stringdefs.h =================================================================== --- Frontier/trunk/Common/headers/stringdefs.h 2006-04-12 17:45:59 UTC (rev 1253) +++ Frontier/trunk/Common/headers/stringdefs.h 2006-04-12 20:27:14 UTC (rev 1254) @@ -29,72 +29,72 @@ - #define STR_Cant_delete_XXX_because_it_hasnt_been_defined "\x31" "Can't delete \"^0\" because it hasn't been defined." - #define STR_The_name_XXX_hasnt_been_defined "\x22" "The name \"^0\" hasn't been defined." - #define STR_Address_value_doesnt_refer_to_a_valid_table "\x2d" "Address value doesn't refer to a valid table." + #define STR_Cant_delete_XXX_because_it_hasnt_been_defined BIGSTRING ("\x31" "Can't delete \"^0\" because it hasn't been defined.") + #define STR_The_name_XXX_hasnt_been_defined BIGSTRING ("\x22" "The name \"^0\" hasn't been defined.") + #define STR_Address_value_doesnt_refer_to_a_valid_table BIGSTRING ("\x2d" "Address value doesn't refer to a valid table.") - #define STR_Assertion "\x5e" "Assertion failed in file ^1, at line ^2. Probably no big deal, but please tell Doug. Thanks!" + #define STR_Assertion BIGSTRING ("\x5e" "Assertion failed in file ^1, at line ^2. Probably no big deal, but please tell Doug. Thanks!") - #define STR_unknown "\x07" "unknown" - #define STR_char "\x04" "char" - #define STR_int "\x03" "int" - #define STR_long "\x04" "long" - #define STR_unused1 "\x07" "unused1" - #define STR_binary "\x06" "binary" - #define STR_boolean "\x07" "boolean" - #define STR_token "\x05" "token" - #define STR_date "\x04" "date" - #define STR_address "\x07" "address" - #define STR_compiled_code "\x0d" "compiled code" - #define STR_string "\x06" "string" - #define STR_external "\x08" "external" - #define STR_direction "\x09" "direction" - #define STR_unused2 "\x07" "unused2" - #define STR_string4 "\x07" "string4" - #define STR_unused3 "\x07" "unused3" - #define STR_point "\x05" "point" - #define STR_rect "\x04" "rect" - #define STR_pattern "\x07" "pattern" - #define STR_rgb "\x03" "rgb" - #define STR_fixed "\x05" "fixed" - #define STR_single "\x06" "single" - #define STR_double "\x06" "double" - #define STR_objspec "\x07" "objspec" - #define STR_filespec "\x08" "filespec" - #define STR_alias "\x05" "alias" - #define STR_enumerator "\x0a" "enumerator" - #define STR_list "\x04" "list" - #define STR_record "\x06" "record" - #define STR_outline "\x07" "outline" - #define STR_wptext "\x06" "wptext" - #define STR_interface "\x09" "interface" - #define STR_headline "\x08" "headline" - #define STR_table "\x05" "table" - #define STR_script "\x06" "script" + #define STR_unknown BIGSTRING ("\x07" "unknown") + #define STR_char BIGSTRING ("\x04" "char") + #define STR_int BIGSTRING ("\x03" "int") + #define STR_long BIGSTRING ("\x04" "long") + #define STR_unused1 BIGSTRING ("\x07" "unused1") + #define STR_binary BIGSTRING ("\x06" "binary") + #define STR_boolean BIGSTRING ("\x07" "boolean") + #define STR_token BIGSTRING ("\x05" "token") + #define STR_date BIGSTRING ("\x04" "date") + #define STR_address BIGSTRING ("\x07" "address") + #define STR_compiled_code BIGSTRING ("\x0d" "compiled code") + #define STR_string BIGSTRING ("\x06" "string") + #define STR_external BIGSTRING ("\x08" "external") + #define STR_direction BIGSTRING ("\x09" "direction") + #define STR_unused2 BIGSTRING ("\x07" "unused2") + #define STR_string4 BIGSTRING ("\x07" "string4") + #define STR_unused3 BIGSTRING ("\x07" "unused3") + #define STR_point BIGSTRING ("\x05" "point") + #define STR_rect BIGSTRING ("\x04" "rect") + #define STR_pattern BIGSTRING ("\x07" "pattern") + #define STR_rgb BIGSTRING ("\x03" "rgb") + #define STR_fixed BIGSTRING ("\x05" "fixed") + #define STR_single BIGSTRING ("\x06" "single") + #define STR_double BIGSTRING ("\x06" "double") + #define STR_objspec BIGSTRING ("\x07" "objspec") + #define STR_filespec BIGSTRING ("\x08" "filespec") + #define STR_alias BIGSTRING ("\x05" "alias") + #define STR_enumerator BIGSTRING ("\x0a" "enumerator") + #define STR_list BIGSTRING ("\x04" "list") + #define STR_record BIGSTRING ("\x06" "record") + #define STR_outline BIGSTRING ("\x07" "outline") + #define STR_wptext BIGSTRING ("\x06" "wptext") + #define STR_interface BIGSTRING ("\x09" "interface") + #define STR_headline BIGSTRING ("\x08" "headline") + #define STR_table BIGSTRING ("\x05" "table") + #define STR_script BIGSTRING ("\x06" "script") #define STR_menubar "\x07" "menubar" - #define STR_picture "\x07" "picture" + #define STR_picture BIGSTRING ("\x07" "picture") - #define STR_with "\x04" "with" - #define STR_this "\x04" "this" + #define STR_with BIGSTRING ("\x04" "with") + #define STR_this BIGSTRING ("\x04" "this") #define STR_temp "\x04" "temp" #define STR_environment "\x0b" "environment" - #define STR_Stack_overflow "\x0f" "Stack overflow!" + #define STR_Stack_overflow BIGSTRING ("\x0f" "Stack overflow!") - #define STR_too_many_pophashtables "\x16" "too many pophashtables" - #define STR_trying_to_dispose_global_symbol_table "\x26" "trying to dispose global symbol table!" - #define STR_pushpackstack_no_room_on_stack "\x1f" "pushpackstack: no room on stack" - #define STR_poppackstack_nothing_on_stack "\x1e" "poppackstack: nothing on stack" - #define STR_Error_unpacking "\x11" "Error unpacking: " + #define STR_too_many_pophashtables BIGSTRING ("\x16" "too many pophashtables") + #define STR_trying_to_dispose_global_symbol_table BIGSTRING ("\x26" "trying to dispose global symbol table!") + #define STR_pushpackstack_no_room_on_stack BIGSTRING ("\x1f" "pushpackstack: no room on stack") + #define STR_poppackstack_nothing_on_stack BIGSTRING ("\x1e" "poppackstack: nothing on stack") + #define STR_Error_unpacking BIGSTRING ("\x11" "Error unpacking: ") - #define STR_The_version_number_of_this_database_file_is_not_recognized_by_this_version_of_Frontier "\x57" "The version number of this database file is not recognized by this version of Frontier." + #define STR_The_version_number_of_this_database_file_is_not_recognized_by_this_version_of_Frontier BIGSTRING ("\x57" "The version number of this database file is not recognized by this version of Frontier.") - #define STR_move "\x04" "move" - #define STR_copy "\x04" "copy" - #define STR_rename "\x06" "rename" - #define STR_moveandrename "\x0d" "moveandrename" - #define STR_assign "\x06" "assign" - #define STR_nil_table_address__Creating_empty_table "\x2b" "nil table address. (Creating empty table.)" + #define STR_move BIGSTRING ("\x04" "move") + #define STR_copy BIGSTRING ("\x04" "copy") + #define STR_rename BIGSTRING ("\x06" "rename") + #define STR_moveandrename BIGSTRING ("\x0d" "moveandrename") + #define STR_assign BIGSTRING ("\x06" "assign") + #define STR_nil_table_address__Creating_empty_table BIGSTRING ("\x2b" "nil table address. (Creating empty table.)") #define STR_compiler "\x08" "compiler" @@ -118,40 +118,40 @@ #define STR_resume "\x06" "resume" #define STR_shutdown "\x08" "shutdown" #define STR_system "\x06" "system" - #define STR_menus "\x05" "menus" + #define STR_menus BIGSTRING ("\x05" "menus") #define STR_menubars "\x0b" "sharedmenus" #define STR_macintosh "\x09" "macintosh" #define STR_objectmodel "\x0b" "objectmodel" #define STR_else "\x04" "else" - #define STR_File_was_created_by_an_incompatible_version_of_this_program "\x3c" "File was created by an incompatible version of this program." - #define STR_Internal_error_attempted_to_read_a_free_block "\x30" "Internal error: attempted to read a free block." - #define STR_Internal_error_unimplemented_function_call "\x24" "Verb unimplemented on this platform." - #define STR_Internal_error_bad_type_for_temp_data "\x28" "Internal error: bad type for temp data." - #define STR_error "\x05" "error" - #define STR_hash_table "\x0a" "hash table" - #define STR_Stack_overflow_XXX_stack "\x1a" "Stack overflow: ^0 stack." - #define STR_outline_stack_overflow "\x17" "outline stack overflow!" - #define STR_wp_stack_overflow "\x12" "wp stack overflow!" - #define STR_database_stack_overflow "\x18" "database stack overflow!" - #define STR_bad_outline_version_number "\x1a" "bad outline version number" - #define STR_bad_list_version_number "\x17" "bad list version number" - #define STR_ourline_windowopen_inconsistency "\x20" "outline windowopen inconsistency" - #define STR_increase_cteditors "\x24" "increase cteditors in shellprivate.h" - #define STR_failed_to_load_a_button_list "\x1c" "failed to load a button list" - #define STR_globals_stack_overflow "\x17" "globals stack overflow!" - #define STR_increase_maxkeyboardhooks "\x19" "increase maxkeyboardhooks" - #define STR_increase_maxdirtyhooks "\x16" "increase maxdirtyhooks" - #define STR_increase_maxmenuhooks "\x15" "increase maxmenuhooks" - #define STR_increase_maxeventhooks "\x16" "increase maxeventhooks" - #define STR_increase_maxerrorhooks "\x16" "increase maxerrorhooks" - #define STR_increase_maxscraphooks "\x16" "increase maxscraphooks" - #define STR_increase_maxmemoryhooks "\x17" "increase maxmemoryhooks" - #define STR_increase_maxfilehooks "\x15" "increase maxfilehooks" + #define STR_File_was_created_by_an_incompatible_version_of_this_program BIGSTRING ("\x3c" "File was created by an incompatible version of this program.") + #define STR_Internal_error_attempted_to_read_a_free_block BIGSTRING ("\x30" "Internal error: attempted to read a free block.") + #define STR_Internal_error_unimplemented_function_call BIGSTRING ("\x24" "Verb unimplemented on this platform.") + #define STR_Internal_error_bad_type_for_temp_data BIGSTRING ("\x28" "Internal error: bad type for temp data.") + #define STR_error BIGSTRING ("\x05" "error") + #define STR_hash_table BIGSTRING ("\x0a" "hash table") + #define STR_Stack_overflow_XXX_stack BIGSTRING ("\x1a" "Stack overflow: ^0 stack.") + #define STR_outline_stack_overflow BIGSTRING ("\x17" "outline stack overflow!") + #define STR_wp_stack_overflow BIGSTRING ("\x12" "wp stack overflow!") + #define STR_database_stack_overflow BIGSTRING ("\x18" "database stack overflow!") + #define STR_bad_outline_version_number BIGSTRING ("\x1a" "bad outline version number") + #define STR_bad_list_version_number BIGSTRING ("\x17" "bad list version number") + #define STR_ourline_windowopen_inconsistency BIGSTRING ("\x20" "outline windowopen inconsistency") + #define STR_increase_cteditors BIGSTRING ("\x24" "increase cteditors in shellprivate.h") + #define STR_failed_to_load_a_button_list BIGSTRING ("\x1c" "failed to load a button list") + #define STR_globals_stack_overflow BIGSTRING ("\x17" "globals stack overflow!") + #define STR_increase_maxkeyboardhooks BIGSTRING ("\x19" "increase maxkeyboardhooks") + #define STR_increase_maxdirtyhooks BIGSTRING ("\x16" "increase maxdirtyhooks") + #define STR_increase_maxmenuhooks BIGSTRING ("\x15" "increase maxmenuhooks") + #define STR_increase_maxeventhooks BIGSTRING ("\x16" "increase maxeventhooks") + #define STR_increase_maxerrorhooks BIGSTRING ("\x16" "increase maxerrorhooks") + #define STR_increase_maxscraphooks BIGSTRING ("\x16" "increase maxscraphooks") + #define STR_increase_maxmemoryhooks BIGSTRING ("\x17" "increase maxmemoryhooks") + #define STR_increase_maxfilehooks BIGSTRING ("\x15" "increase maxfilehooks") - #define STR_Unknown_error "\x0e" "Unknown error." - #define STR_Mac_OS_Error "\x0e" "Mac OS Error: " + #define STR_Unknown_error BIGSTRING ("\x0e" "Unknown error.") + #define STR_Mac_OS_Error BIGSTRING ("\x0e" "Mac OS Error: ") - #define STR_menuseparator "\x02" "(-" + #define STR_menuseparator BIGSTRING ("\x02" "(-") #define STR_hexprefix "\x02" "0x" Modified: Frontier/trunk/Common/headers/versions.h =================================================================== --- Frontier/trunk/Common/headers/versions.h 2006-04-12 17:45:59 UTC (rev 1253) +++ Frontier/trunk/Common/headers/versions.h 2006-04-12 20:27:14 UTC (rev 1254) @@ -56,10 +56,10 @@ #define APPNAME "Radio" #define APP_COPYRIGHT_HOLDER "UserLand Software, Inc" - #define bs_APP_NAME "\x05" "Radio" - #define bs_APP_SLOGAN "\x2b" "The power of Web publishing on your desktop" - #define bs_APP_COPYRIGHT "\x23" "\xA9 " APP_COPYRIGHT_FROM "-" APP_COPYRIGHT_TILL " UserLand Software, Inc." - #define bs_APP_URL "\x26" "http://frontierkernel.sourceforge.net/" + #define bs_APP_NAME BIGSTRING ("\x05" "Radio") + #define bs_APP_SLOGAN BIGSTRING ("\x2b" "The power of Web publishing on your desktop") + #define bs_APP_COPYRIGHT BIGSTRING ("\x23" "\xA9 " APP_COPYRIGHT_FROM "-" APP_COPYRIGHT_TILL " UserLand Software, Inc.") + #define bs_APP_URL BIGSTRING ("\x26" "http://frontierkernel.sourceforge.net/") #define APP_MAJOR_VERSION 10 #define APP_MAJOR_VERSION_BCD 0x10 /* major version in BCD notation */ @@ -82,10 +82,10 @@ #define APP_COPYRIGHT_HOLDER "Scripting News, Inc" - #define bs_APP_NAME "\x04" "OPML" - #define bs_APP_SLOGAN "\x25" "Powerful OPML editing on your desktop" - #define bs_APP_COPYRIGHT "\x20" "\xA9 " APP_COPYRIGHT_FROM "-" APP_COPYRIGHT_TILL " Scripting News, Inc." - #define bs_APP_URL "\x18" "http://support.opml.org/" + #define bs_APP_NAME BIGSTRING ("\x04" "OPML") + #define bs_APP_SLOGAN BIGSTRING ("\x25" "Powerful OPML editing on your desktop") + #define bs_APP_COPYRIGHT BIGSTRING ("\x20" "\xA9 " APP_COPYRIGHT_FROM "-" APP_COPYRIGHT_TILL " Scripting News, Inc.") + #define bs_APP_URL BIGSTRING ("\x18" "http://support.opml.org/") #define APP_MAJOR_VERSION 10 #define APP_MAJOR_VERSION_BCD 0x10 /* major version in BCD notation */ @@ -108,10 +108,10 @@ #define APPNAME "Frontier" #define APP_COPYRIGHT_HOLDER "Frontier Kernel Project" - #define bs_APP_NAME "\x08" "Frontier" - #define bs_APP_SLOGAN "\x25" "Powerful cross-platform web scripting" - #define bs_APP_COPYRIGHT "\x23" "\xA9 " APP_COPYRIGHT_FROM "-" APP_COPYRIGHT_TILL " Frontier Kernel Project" - #define bs_APP_URL "\x26" "http://frontierkernel.sourceforge.net/" + #define bs_APP_NAME BIGSTRING ("\x08" "Frontier") + #define bs_APP_SLOGAN BIGSTRING ("\x25" "Powerful cross-platform web scripting") + #define bs_APP_COPYRIGHT BIGSTRING ("\x23" "\xA9 " APP_COPYRIGHT_FROM "-" APP_COPYRIGHT_TILL " Frontier Kernel Project") + #define bs_APP_URL BIGSTRING ("\x26" "http://frontierkernel.sourceforge.net/") #define APP_MAJOR_VERSION 10 #define APP_MAJOR_VERSION_BCD 0x10 /* major version in BCD notation */ @@ -128,7 +128,7 @@ #endif -#define bs_APP_COPYRIGHT2 "\x22" "\xA9 1992-2004 UserLand Software, Inc" +#define bs_APP_COPYRIGHT2 BIGSTRING ("\x22" "\xA9 1992-2004 UserLand Software, Inc") #define APP_COPYRIGHT APP_COPYRIGHT_FROM "-" APP_COPYRIGHT_TILL " " APP_COPYRIGHT_HOLDER #define APPNAME_SHORT APPNAME /* 2006-02-04 aradke */ Modified: Frontier/trunk/Common/source/OpenTransportNetEvents.c =================================================================== --- Frontier/trunk/Common/source/OpenTransportNetEvents.c 2006-04-12 17:45:59 UTC (rev 1253) +++ Frontier/trunk/Common/source/OpenTransportNetEvents.c 2006-04-12 20:27:14 UTC (rev 1254) @@ -134,145 +134,145 @@ static unsigned char * xtierrorstrings [] = { - "", /* 3149 */ - "\x1B" "A Bad address was specified", /* 3150 */ - "\x1A" "A Bad option was specified", /* 3151 */ - "\x19" "Missing access permission", /* 3152 */ - "\x16" "Bad provider reference", /* 3153 */ - "\x18" "No address was specified", /* 3154 */ - "\x1A" "Call issued in wrong state", /* 3155 */ - "\x21" "Sequence specified does not exist", /* 3156 */ - "\x17" "A system error occurred", /* 3157 */ - "\x21" "An event occurred - call OTLook()", /* 3158 */ - "\x27" "An illegal amount of data was specified", /* 3159 */ - "\x1C" "Passed buffer not big enough", /* 3160 */ - "\x1B" "Provider is flow-controlled", /* 3161 */ - "\x1D" "No data available for reading", /* 3162 */ - "\x22" "No disconnect indication available", /* 3163 */ - "\x27" "No Unit Data Error indication available", /* 3164 */ - "\x1D" "A Bad flag value was supplied", /* 3165 */ - "\x27" "No orderly release indication available", /* 3166 */ - "\x18" "Command is not supported", /* 3167 */ - "\x23" "State is changing - try again later", /* 3168 */ - "\x28" "Bad structure type requested for OTAlloc", /* 3169 */ - "\x1A" "Host not found (DNS error)", /* 3170 */ - "\x29" "A Bind to an in-use address with qlen > 0", /* 3171 */ - "\x23" "Address requested is already in use", /* 3172 */ - "\x27" "Accept failed because of pending listen", /* 3173 */ - "\x28" "Tried to accept on incompatible endpoint", /* 3174 */ - "", /* 3175 */ - "", /* 3176 */ - "", /* 3177 */ - "\x26" "An unspecified provider error occurred", /* 3178 */ - "\x24" "A synchronous call at interrupt time", /* 3179 */ - "\x19" "The command was cancelled" /* 3180 */ + BIGSTRING (""), /* 3149 */ + BIGSTRING ("\x1B" "A Bad address was specified"), /* 3150 */ + BIGSTRING ("\x1A" "A Bad option was specified"), /* 3151 */ + BIGSTRING ("\x19" "Missing access permission"), /* 3152 */ + BIGSTRING ("\x16" "Bad provider reference"), /* 3153 */ + BIGSTRING ("\x18" "No address was specified"), /* 3154 */ + BIGSTRING ("\x1A" "Call issued in wrong state"), /* 3155 */ + BIGSTRING ("\x21" "Sequence specified does not exist"), /* 3156 */ + BIGSTRING ("\x17" "A system error occurred"), /* 3157 */ + BIGSTRING ("\x21" "An event occurred - call OTLook()"), /* 3158 */ + BIGSTRING ("\x27" "An illegal amount of data was specified"), /* 3159 */ + BIGSTRING ("\x1C" "Passed buffer not big enough"), /* 3160 */ + BIGSTRING ("\x1B" "Provider is flow-controlled"), /* 3161 */ + BIGSTRING ("\x1D" "No data available for reading"), /* 3162 */ + BIGSTRING ("\x22" "No disconnect indication available"), /* 3163 */ + BIGSTRING ("\x27" "No Unit Data Error indication available"), /* 3164 */ + BIGSTRING ("\x1D" "A Bad flag value was supplied"), /* 3165 */ + BIGSTRING ("\x27" "No orderly release indication available"), /* 3166 */ + BIGSTRING ("\x18" "Command is not supported"), /* 3167 */ + BIGSTRING ("\x23" "State is changing - try again later"), /* 3168 */ + BIGSTRING ("\x28" "Bad structure type requested for OTAlloc"), /* 3169 */ + BIGSTRING ("\x1A" "Host not found (DNS error)"), /* 3170 */ + BIGSTRING ("\x29" "A Bind to an in-use address with qlen > 0"), /* 3171 */ + BIGSTRING ("\x23" "Address requested is already in use"), /* 3172 */ + BIGSTRING ("\x27" "Accept failed because of pending listen"), /* 3173 */ + BIGSTRING ("\x28" "Tried to accept on incompatible endpoint"), /* 3174 */ + BIGSTRING (""), /* 3175 */ + BIGSTRING (""), /* 3176 */ + BIGSTRING (""), /* 3177 */ + BIGSTRING ("\x26" "An unspecified provider error occurred"), /* 3178 */ + BIGSTRING ("\x24" "A synchronous call at interrupt time"), /* 3179 */ + BIGSTRING ("\x19" "The command was cancelled") /* 3180 */ }; #if 0 static unsigned char * dnserrorstrings [5] = { - "", - "\x1b" "Host not found. (DNS error)", /* 1 */ - "\x37" "Non-authoritative host not found. (Temporary DNS error)", /* 2 */ - "\x22" "Non-recoverable error. (DNS error)", /* 3 */ - "\x39" "Valid name, no data record of requested type. (DNS error)", /* 4 */ + BIGSTRING (""), + BIGSTRING ("\x1b" "Host not found. (DNS error)"), /* 1 */ + BIGSTRING ("\x37" "Non-authoritative host not found. (Temporary DNS error)"), /* 2 */ + BIGSTRING ("\x22" "Non-recoverable error. (DNS error)"), /* 3 */ + BIGSTRING ("\x39" "Valid name, no data record of requested type. (DNS error)"), /* 4 */ }; #endif static unsigned char * stdcliberrorstrings [80] = { - "", - "\x1b" "Permission denied", /* 1 */ - "\x37" "No such file or directory", /* 2 */ - "\x22" "No such resource", /* 3 */ - "\x39" "Interrupted system service", /* 4 */ - "\x12" "Input/output error", /* 5 */ - "\x15" "Device not configured", /* 6 */ - "\x16" "Argument list too long", /* 7 */ - "\x11" "Exec format error", /* 8 */ - "\x13" "Bad file descriptor", /* 9 */ - "\x12" "No child processes", /* 10 */ - "\x19" "Resource deadlock avoided", /* 11 */ - "\x16" "Cannot allocate memory", /* 12 */ - "\x11" "Permission denied", /* 13 */ - "\x0b" "Bad address", /* 14 */ - "\x15" "Block device required", /* 15 */ - "\x0b" "Device busy", /* 16 */ - "\x0b" "File exists", /* 17 */ - "\x11" "Cross-device link", /* 18 */ - "\x21" "Operation not supported by device", /* 19 */ - "\x0f" "Not a directory", /* 20 */ - "\x0e" "Is a directory", /* 21 */ - "\x10" "Invalid argument", /* 22 */ - "\x1d" "Too many open files in system", /* 23 */ - "\x15" "Too many open sockets", /* 24 */ - "\x1e" "Inappropriate ioctl for device", /* 25 */ - "\x0e" "Text file busy", /* 26 */ - "\x0e" "File too large", /* 27 */ - "\x17" "No space left on device", /* 28 */ - "\x0d" "Illegal seek", /* 29 */ - "\x15" "Read-only file system", /* 30 */ - "\x0e" "Too many links", /* 31 */ - "\x0b" "Broken pipe", /* 32 */ - "", - "", + BIGSTRING (""), + BIGSTRING ("\x1b" "Permission denied"), /* 1 */ + BIGSTRING ("\x37" "No such file or directory"), /* 2 */ + BIGSTRING ("\x22" "No such resource"), /* 3 */ + BIGSTRING ("\x39" "Interrupted system service"), /* 4 */ + BIGSTRING ("\x12" "Input/output error"), /* 5 */ + BIGSTRING ("\x15" "Device not configured"), /* 6 */ + BIGSTRING ("\x16" "Argument list too long"), /* 7 */ + BIGSTRING ("\x11" "Exec format error"), /* 8 */ + BIGSTRING ("\x13" "Bad file descriptor"), /* 9 */ + BIGSTRING ("\x12" "No child processes"), /* 10 */ + BIGSTRING ("\x19" "Resource deadlock avoided"), /* 11 */ + BIGSTRING ("\x16" "Cannot allocate memory"), /* 12 */ + BIGSTRING ("\x11" "Permission denied"), /* 13 */ + BIGSTRING ("\x0b" "Bad address"), /* 14 */ + BIGSTRING ("\x15" "Block device required"), /* 15 */ + BIGSTRING ("\x0b" "Device busy"), /* 16 */ + BIGSTRING ("\x0b" "File exists"), /* 17 */ + BIGSTRING ("\x11" "Cross-device link"), /* 18 */ + BIGSTRING ("\x21" "Operation not supported by device"), /* 19 */ + BIGSTRING ("\x0f" "Not a directory"), /* 20 */ + BIGSTRING ("\x0e" "Is a directory"), /* 21 */ + BIGSTRING ("\x10" "Invalid argument"), /* 22 */ + BIGSTRING ("\x1d" "Too many open files in system"), /* 23 */ + BIGSTRING ("\x15" "Too many open sockets"), /* 24 */ + BIGSTRING ("\x1e" "Inappropriate ioctl for device"), /* 25 */ + BIGSTRING ("\x0e" "Text file busy"), /* 26 */ + BIGSTRING ("\x0e" "File too large"), /* 27 */ + BIGSTRING ("\x17" "No space left on device"), /* 28 */ + BIGSTRING ("\x0d" "Illegal seek"), /* 29 */ + BIGSTRING ("\x15" "Read-only file system"), /* 30 */ + BIGSTRING ("\x0e" "Too many links"), /* 31 */ + BIGSTRING ("\x0b" "Broken pipe"), /* 32 */ + BIGSTRING (""), + BIGSTRING (""), /* non-blocking and interrupt i/o */ - "\x20" "Resource temporarily unavailable", /* 35 */ + BIGSTRING ("\x20" "Resource temporarily unavailable"), /* 35 */ /* ipc/network software -- argument errors */ - "\x23" "A blocking operation is in progress", /* 36 */ - "\x20" "Operation is already in progress", /* 37 */ + BIGSTRING ("\x23" "A blocking operation is in progress"), /* 36 */ + BIGSTRING ("\x20" "Operation is already in progress"), /* 37 */ /* ipc/network software -- argument errors */ - "\x20" "Socket operation on a non-socket", /* 38 */ - "\x1f" "Destination address is required", /* 39 */ - "\x10" "Message too long", /* 40 */ - "\x1e" "Protocol wrong type for socket", /* 41 */ - "\x16" "Protocol not available", /* 42 */ - "\x16" "Protocol not supported", /* 43 */ - "\x19" "Socket type not supported", /* 44 */ - "\x21" "Operation not supported on socket", /* 45 */ - "\x1d" "Protocol family not supported", /* 46 */ - "\x2f" "Address family not supported by protocol family", /* 47 */ - "\x16" "Address already in use", /* 48 */ - "\x1e" "Can't assign requested address", /* 49 */ + BIGSTRING ("\x20" "Socket operation on a non-socket"), /* 38 */ + BIGSTRING ("\x1f" "Destination address is required"), /* 39 */ + BIGSTRING ("\x10" "Message too long"), /* 40 */ + BIGSTRING ("\x1e" "Protocol wrong type for socket"), /* 41 */ + BIGSTRING ("\x16" "Protocol not available"), /* 42 */ + BIGSTRING ("\x16" "Protocol not supported"), /* 43 */ + BIGSTRING ("\x19" "Socket type not supported"), /* 44 */ + BIGSTRING ("\x21" "Operation not supported on socket"), /* 45 */ + BIGSTRING ("\x1d" "Protocol family not supported"), /* 46 */ + BIGSTRING ("\x2f" "Address family not supported by protocol family"), /* 47 */ + BIGSTRING ("\x16" "Address already in use"), /* 48 */ + BIGSTRING ("\x1e" "Can't assign requested address"), /* 49 */ /* ipc/network software -- operational errors */ - "\x0f" "Network is down", /* 50 */ - "\x16" "Network is unreachable", /* 51 */ - "\x23" "Network dropped connection on reset", /* 52 */ - "\x20" "Software caused connection abort", /* 53 */ - "\x18" "Connection reset by peer", /* 54 */ - "\x19" "No buffer space available", /* 55 */ - "\x1b" "Socket is already connected", /* 56 */ - "\x17" "Socket is not connected", /* 57 */ - "\x20" "Can't send after socket shutdown", /* 58 */ - "\x21" "Too many references: can't splice", /* 59 */ - "\x14" "Connection timed out", /* 60 */ - "\x12" "Connection refused", /* 61 */ + BIGSTRING ("\x0f" "Network is down"), /* 50 */ + BIGSTRING ("\x16" "Network is unreachable"), /* 51 */ + BIGSTRING ("\x23" "Network dropped connection on reset"), /* 52 */ + BIGSTRING ("\x20" "Software caused connection abort"), /* 53 */ + BIGSTRING ("\x18" "Connection reset by peer"), /* 54 */ + BIGSTRING ("\x19" "No buffer space available"), /* 55 */ + BIGSTRING ("\x1b" "Socket is already connected"), /* 56 */ + BIGSTRING ("\x17" "Socket is not connected"), /* 57 */ + BIGSTRING ("\x20" "Can't send after socket shutdown"), /* 58 */ + BIGSTRING ("\x21" "Too many references: can't splice"), /* 59 */ + BIGSTRING ("\x14" "Connection timed out"), /* 60 */ + BIGSTRING ("\x12" "Connection refused"), /* 61 */ - "\x21" "Too many levels of symbolic links", /* 62 */ - "\x12" "File name too long", /* 63 */ + BIGSTRING ("\x21" "Too many levels of symbolic links"), /* 62 */ + BIGSTRING ("\x12" "File name too long"), /* 63 */ - "\x0c" "Host is down", /* 64 */ - "\x10" "No route to host", /* 65 */ - "\x13" "Directory not empty", /* 66 */ - "\x12" "Too many processes", /* 67 */ - "\x0e" "Too many users", /* 68 */ - "\x13" "Disc quota exceeded", /* 69 */ + BIGSTRING ("\x0c" "Host is down"), /* 64 */ + BIGSTRING ("\x10" "No route to host"), /* 65 */ + BIGSTRING ("\x13" "Directory not empty"), /* 66 */ + BIGSTRING ("\x12" "Too many processes"), /* 67 */ + BIGSTRING ("\x0e" "Too many users"), /* 68 */ + BIGSTRING ("\x13" "Disc quota exceeded"), /* 69 */ /* Network File System */ - "\x15" "Stale NFS file handle", /* 70 */ - "\x21" "Too many levels of remote in path", /* 71 */ - "\x11" "RPC struct is bad", /* 72 */ - "\x11" "RPC version wrong", /* 73 */ - "\x13" "RPC prog. not avail", /* 74 */ - "\x15" "Program version wrong", /* 75 */ - "\x19" "Bad procedure for program", /* 76 */ - "\x12" "No locks available", /* 77 */ - "\x18" "Function not implemented", /* 78 */ - "\x21" "Inappropriate file type or format", /* 79 */ + BIGSTRING ("\x15" "Stale NFS file handle"), /* 70 */ + BIGSTRING ("\x21" "Too many levels of remote in path"), /* 71 */ + BIGSTRING ("\x11" "RPC struct is bad"), /* 72 */ + BIGSTRING ("\x11" "RPC version wrong"), /* 73 */ + BIGSTRING ("\x13" "RPC prog. not avail"), /* 74 */ + BIGSTRING ("\x15" "Program version wrong"), /* 75 */ + BIGSTRING ("\x19" "Bad procedure for program"), /* 76 */ + BIGSTRING ("\x12" "No locks available"), /* 77 */ + BIGSTRING ("\x18" "Function not implemented"), /* 78 */ + BIGSTRING ("\x21" "Inappropriate file type or format"), /* 79 */ }; //tcperrorstrings #define wsprintf sprintf @@ -2375,7 +2375,7 @@ if (!isemptystring (bs)) { - pushstring ("\x03" " - ", errbs); + pushstring (BIGSTRING ("\x03" " - "), errbs); pushstring (bs, errbs); } @@ -2406,7 +2406,7 @@ copystring (dnserrorstrings [1], bs); //handles nil source - pushstring ("\x03" " - ", errbs); + pushstring (BIGSTRING ("\x03" " - "), errbs); pushstring (bs, errbs); @@ -2487,7 +2487,7 @@ err = Gestalt (sOTVersionSelector, (long*) &sOTVersion); if (err || (sOTVersion < kOTVersion111)) { - plainneterror ("\x23" "Please install Open Transport 1.1.1 or later."); + plainneterror (BIGSTRING ("\x23" "Please install Open Transport 1.1.1 or later.")); return (false); } @@ -3603,7 +3603,7 @@ if (!incrementconnectioncounter ()) { - plainneterror ("\x54" "Can't open stream because no more than five TCP connections may be open at any time."); + plainneterror (BIGSTRING ("\x54" "Can't open stream because no more than five TCP connections may be open at any time.")); return (false); } @@ -5139,4 +5139,4 @@ } return (true); - }/*fwsNetEventGetStats*/ \ No newline at end of file + }/*fwsNetEventGetStats*/ Modified: Frontier/trunk/Common/source/WinSockNetEvents.c =================================================================== --- Frontier/trunk/Common/source/WinSockNetEvents.c 2006-04-12 17:45:59 UTC (rev 1253) +++ Frontier/trunk/Common/source/WinSockNetEvents.c 2006-04-12 20:27:14 UTC (rev 1254) @@ -153,98 +153,98 @@ static unsigned char * tcperrorstrings [80] = { - "", - "\x1b" "Host not found. (DNS error)", /* 1 */ - "\x37" "Non-authoritative host not found. (Temporary DNS error)", /* 2 */ - "\x22" "Non-recoverable error. (DNS error)", /* 3 */ - "\x39" "Valid name, no data record of requested type. (DNS error)", /* 4 */ - "\x12" "Input/output error", /* 5 */ - "\x15" "Device not configured", /* 6 */ - "\x16" "Argument list too long", /* 7 */ - "\x11" "Exec format error", /* 8 */ - "\x13" "Bad file descriptor", /* 9 */ - "\x12" "No child processes", /* 10 */ - "\x19" "Resource deadlock avoided", /* 11 */ - "\x16" "Cannot allocate memory", /* 12 */ - "\x11" "Permission denied", /* 13 */ - "\x0b" "Bad address", /* 14 */ - "\x15" "Block device required", /* 15 */ - "\x0b" "Device busy", /* 16 */ - "\x0b" "File exists", /* 17 */ - "\x11" "Cross-device link", /* 18 */ - "\x21" "Operation not supported by device", /* 19 */ - "\x0f" "Not a directory", /* 20 */ - "\x0e" "Is a directory", /* 21 */ - "\x10" "Invalid argument", /* 22 */ - "\x1d" "Too many open files in system", /* 23 */ - "\x15" "Too many open sockets", /* 24 */ - "\x1e" "Inappropriate ioctl for device", /* 25 */ - "\x0e" "Text file busy", /* 26 */ - "\x0e" "File too large", /* 27 */ - "\x17" "No space left on device", /* 28 */ - "\x0d" "Illegal seek", /* 29 */ - "\x15" "Read-only file system", /* 30 */ - "\x0e" "Too many links", /* 31 */ - "\x0b" "Broken pipe", /* 32 */ - "", - "", + BIGSTRING (""), + BIGSTRING ("\x1b" "Host not found. (DNS error)"), /* 1 */ + BIGSTRING ("\x37" "Non-authoritative host not found. (Temporary DNS error)"), /* 2 */ + BIGSTRING ("\x22" "Non-recoverable error. (DNS error)"), /* 3 */ + BIGSTRING ("\x39" "Valid name, no data record of requested type. (DNS error)"), /* 4 */ + BIGSTRING ("\x12" "Input/output error"), /* 5 */ + BIGSTRING ("\x15" "Device not configured"), /* 6 */ + BIGSTRING ("\x16" "Argument list too long"), /* 7 */ + BIGSTRING ("\x11" "Exec format error"), /* 8 */ + BIGSTRING ("\x13" "Bad file descriptor"), /* 9 */ + BIGSTRING ("\x12" "No child processes"), /* 10 */ + BIGSTRING ("\x19" "Resource deadlock avoided"), /* 11 */ + BIGSTRING ("\x16" "Cannot allocate memory"), /* 12 */ + BIGSTRING ("\x11" "Permission denied"), /* 13 */ + BIGSTRING ("\x0b" "Bad address"), /* 14 */ + BIGSTRING ("\x15" "Block device required"), /* 15 */ + BIGSTRING ("\x0b" "Device busy"), /* 16 */ + BIGSTRING ("\x0b" "File exists"), /* 17 */ + BIGSTRING ("\x11" "Cross-device link"), /* 18 */ + BIGSTRING ("\x21" "Operation not supported by device"), /* 19 */ + BIGSTRING ("\x0f" "Not a directory"), /* 20 */ + BIGSTRING ("\x0e" "Is a directory"), /* 21 */ + BIGSTRING ("\x10" "Invalid argument"), /* 22 */ + BIGSTRING ("\x1d" "Too many open files in system"), /* 23 */ + BIGSTRING ("\x15" "Too many open sockets"), /* 24 */ + BIGSTRING ("\x1e" "Inappropriate ioctl for device"), /* 25 */ + BIGSTRING ("\x0e" "Text file busy"), /* 26 */ + BIGSTRING ("\x0e" "File too large"), /* 27 */ + BIGSTRING ("\x17" "No space left on device"), /* 28 */ + BIGSTRING ("\x0d" "Illegal seek"), /* 29 */ + BIGSTRING ("\x15" "Read-only file system"), /* 30 */ + BIGSTRING ("\x0e" "Too many links"), /* 31 */ + BIGSTRING ("\x0b" "Broken pipe"), /* 32 */ + BIGSTRING (""), + BIGSTRING (""), /* non-blocking and interrupt i/o */ - "\x20" "Resource temporarily unavailable", /* 35 */ + BIGSTRING ("\x20" "Resource temporarily unavailable"), /* 35 */ /* ipc/network software -- argument errors */ - "\x23" "A blocking operation is in progress", /* 36 */ - "\x20" "Operation is already in progress", /* 37 */ + BIGSTRING ("\x23" "A blocking operation is in progress"), /* 36 */ + BIGSTRING ("\x20" "Operation is already in progress"), /* 37 */ /* ipc/network software -- argument errors */ - "\x20" "Socket operation on a non-socket", /* 38 */ - "\x1f" "Destination address is required", /* 39 */ - "\x10" "Message too long", /* 40 */ - "\x1e" "Protocol wrong type for socket", /* 41 */ - "\x16" "Protocol not available", /* 42 */ - "\x16" "Protocol not supported", /* 43 */ - "\x19" "Socket type not supported", /* 44 */ - "\x21" "Operation not supported on socket", /* 45 */ - "\x1d" "Protocol family not supported", /* 46 */ - "\x2f" "Address family not supported by protocol family", /* 47 */ - "\x16" "Address already in use", /* 48 */ - "\x1e" "Can't assign requested address", /* 49 */ + BIGSTRING ("\x20" "Socket operation on a non-socket"), /* 38 */ + BIGSTRING ("\x1f" "Destination address is required"), /* 39 */ + BIGSTRING ("\x10" "Message too long"), /* 40 */ + BIGSTRING ("\x1e" "Protocol wrong type for socket"), /* 41 */ + BIGSTRING ("\x16" "Protocol not available"), /* 42 */ + BIGSTRING ("\x16" "Protocol not supported"), /* 43 */ + BIGSTRING ("\x19" "Socket type not supported"), /* 44 */ + BIGSTRING ("\x21" "Operation not supported on socket"), /* 45 */ + BIGSTRING ("\x1d" "Protocol family not supported"), /* 46 */ + BIGSTRING ("\x2f" "Address family not supported by protocol family"), /* 47 */ + BIGSTRING ("\x16" "Address already in use"), /* 48 */ + BIGSTRING ("\x1e" "Can't assign requested address"), /* 49 */ /* ipc/network software -- operational errors */ - "\x0f" "Network is down", /* 50 */ - "\x16" "Network is unreachable", /* 51 */ - "\x23" "Network dropped connection on reset", /* 52 */ - "\x20" "Software caused connection abort", /* 53 */ - "\x18" "Connection reset by peer", /* 54 */ - "\x19" "No buffer space available", /* 55 */ - "\x1b" "Socket is already connected", /* 56 */ - "\x17" "Socket is not connected", /* 57 */ - "\x20" "Can't send after socket shutdown", /* 58 */ - "\x21" "Too many references: can't splice", /* 59 */ - "\x14" "Connection timed out", /* 60 */ - "\x12" "Connection refused", /* 61 */ + BIGSTRING ("\x0f" "Network is down"), /* 50 */ + BIGSTRING ("\x16" "Network is unreachable"), /* 51 */ + BIGSTRING ("\x23" "Network dropped connection on reset"), /* 52 */ + BIGSTRING ("\x20" "Software caused connection abort"), /* 53 */ + BIGSTRING ("\x18" "Connection reset by peer"), /* 54 */ + BIGSTRING ("\x19" "No buffer space available"), /* 55 */ + BIGSTRING ("\x1b" "Socket is already connected"), /* 56 */ + BIGSTRING ("\x17" "Socket is not connected"), /* 57 */ + BIGSTRING ("\x20" "Can't send after socket shutdown"), /* 58 */ + BIGSTRING ("\x21" "Too many references: can't splice"), /* 59 */ + BIGSTRING ("\x14" "Connection timed out"), /* 60 */ + BIGSTRING ("\x12" "Connection refused"), /* 61 */ - "\x21" "Too many levels of symbolic links", /* 62 */ - "\x12" "File name too long", /* 63 */ + BIGSTRING ("\x21" "Too many levels of symbolic links"), /* 62 */ + BIGSTRING ("\x12" "File name too long"), /* 63 */ - "\x0c" "Host is down", /* 64 */ - "\x10" "No route to host", /* 65 */ - "\x13" "Directory not empty", /* 66 */ - "\x12" "Too many processes", /* 67 */ - "\x0e" "Too many users", /* 68 */ - "\x13" "Disc quota exceeded", /* 69 */ + BIGSTRING ("\x0c" "Host is down"), /* 64 */ + BIGSTRING ("\x10" "No route to host"), /* 65 */ + BIGSTRING ("\x13" "Directory not empty"), /* 66 */ + BIGSTRING ("\x12" "Too many processes"), /* 67 */ + BIGSTRING ("\x0e" "Too many users"), /* 68 */ + BIGSTRING ("\x13" "Disc quota exceeded"), /* 69 */ /* Network File System */ - "\x15" "Stale NFS file handle", /* 70 */ - "\x21" "Too many levels of remote in path", /* 71 */ - "\x11" "RPC struct is bad", /* 72 */ - "\x11" "RPC version wrong", /* 73 */ - "\x13" "RPC prog. not avail", /* 74 */ - "\x15" "Program version wrong", /* 75 */ - "\x19" "Bad procedure for program", /* 76 */ - "\x12" "No locks available", /* 77 */ - "\x18" "Function not implemented", /* 78 */ - "\x21" "Inappropriate file type or format", /* 79 */ + BIGSTRING ("\x15" "Stale NFS file handle"), /* 70 */ + BIGSTRING ("\x21" "Too many levels of remote in path"), /* 71 */ + BIGSTRING ("\x11" "RPC struct is bad"), /* 72 */ + BIGSTRING ("\x11" "RPC version wrong"), /* 73 */ + BIGSTRING ("\x13" "RPC prog. not avail"), /* 74 */ + BIGSTRING ("\x15" "Program version wrong"), /* 75 */ + BIGSTRING ("\x19" "Bad procedure for program"), /* 76 */ + BIGSTRING ("\x12" "No locks available"), /* 77 */ + BIGSTRING ("\x18" "Function not implemented"), /* 78 */ + BIGSTRING ("\x45" "Can't read stream because the TCP connection was closed unexpectedly."), /* 79 */ }; //tcperrorstrings @@ -497,7 +497,7 @@ -#define STR_P_ERROR_CLOSED_PREMATURELY "\x45" "Can't read stream because the TCP connection was closed unexpectedly." +#define STR_P_ERROR_CLOSED_PREMATURELY BIGSTRING ("\x45" "Can't read stream because the TCP connection was closed unexpectedly.") /* To disable the tcp tracker, don't define TCPTRACKER. @@ -945,7 +945,7 @@ //if (equaltextidentifiers (stringbaseaddress(bs), "No information available for error number", (short)strlen("No information available for error number")) != true) { if (!isemptystring (bs)) { - pushstring ("\x03" " - ", errbs); + pushstring (BIGSTRING ("\x03" " - "), errbs); pushstring (bs, errbs); } @@ -1367,11 +1367,11 @@ #if (TCPTRACKER >= 2) //if reporting to file long l; - if (getProfileLong ("\x0a" "TCPTracker", &l)) { + if (getProfileLong (BIGSTRING ("\x0a" "TCPTracker"), &l)) { fllogger = (boolean) l; } else { - setProfileLong ("\x0a" "TCPTracker", fllogger); /*this just sets the value in the registry*/ + setProfileLong (BIGSTRING ("\x0a" "TCPTracker"), fllogger); /*this just sets the value in the registry*/ } #endif @@ -2537,7 +2537,7 @@ #ifdef PIKE if (!incrementconnectioncounter ()) { - plainneterror ("\x54" "Can't open stream because no more than five TCP connections may be open at any time."); + plainneterror (BIGSTRING ("\x54" "Can't open stream because no more than five TCP connections may be open at any time.")); return (false); } Modified: Frontier/trunk/Common/source/about.c =================================================================== --- Frontier/trunk/Common/source/about.c 2006-04-12 17:45:59 UTC (rev 1253) +++ Frontier/trunk/Common/source/about.c 2006-04-12 20:27:14 UTC (rev 1254) @@ -173,28 +173,28 @@ bs_APP_URL, /* 2006-02-06 aradke: see versions.h */ - "\x02" "^0", + BIGSTRING ("\x02" "^0"), - "\x12" "Scripts Running: ", + BIGSTRING ("\x12" "Scripts Running: "), - "\x11" "Current Thread: ", + BIGSTRING ("\x11" "Current Thread: "), #ifdef MACVERSION - "\x13" "Available Memory: ", + BIGSTRING ("\x13" "Available Memory: "), #endif #ifdef WIN95VERSION - "\x14" "Handles Allocated: ", + BIGSTRING ("\x14" "Handles Allocated: "), #endif - "", + BIGSTRING (""), - "\x10" "Visible Agent: ", + BIGSTRING ("\x10" "Visible Agent: "), - "\x0f" "Current Time: ", + BIGSTRING ("\x0f" "Current Time: "), bs_APP_NAME, /* 2006-02-06 aradke: see versions.h */ - "\x02" "^0", + BIGSTRING ("\x02" "^0"), }; @@ -720,7 +720,7 @@ #ifdef WIN95VERSION short tmfont; - fontgetnumber ("\x05" "Arial", &tmfont); + fontgetnumber (BIGSTRING ("\x05" "Arial"), &tmfont); if (tmfont != 0) setglobalfontsizestyle (tmfont, 9, bold); @@ -761,11 +761,11 @@ #if __powerc // ccdrawtextitem (isaitem, "\pPowerPC", normal); - parsedialogstring (aboutstrings [isaitem], "\x07" "PowerPC", nil, nil, nil, bs); + parsedialogstring (aboutstrings [isaitem], BIGSTRING ("\x07" "PowerPC"), nil, nil, nil, bs); #else - parsedialogstring (aboutstrings [isaitem], "\x05" "680x0", nil, nil, nil, bs); + parsedialogstring (aboutstrings [isaitem], BIGSTRING ("\x05" "680x0"), nil, nil, nil, bs); #endif @@ -779,7 +779,7 @@ #ifdef fltrialsize - insertstring ("\x06" "Trial ", bs); + insertstring (BIGSTRING ("\x06" "Trial "), bs); #endif @@ -841,7 +841,7 @@ if ((**hg).hprocess) { - pushstring ("\x02" " [", bstheadinfo); + pushstring (BIGSTRING ("\x02" " ["), bstheadinfo); pushstring ((**(**hg).hprocess).bsname, bstheadinfo); @@ -849,7 +849,7 @@ } } else - insertstring ("\x06" "(out) ", bstheadinfo); + insertstring (BIGSTRING ("\x06" "(out) "), bstheadinfo); if (aboutdata != nil) ccupdatestatistics (false); @@ -1613,7 +1613,7 @@ copystring (aboutstrings [frontieritem], bstitle); if (!flbootsplash) - insertstring ("\x06" "About ", bstitle); /* 2006-02-04 aradke: eliminated titleitem */ + insertstring (BIGSTRING ("\x06" "About "), bstitle); /* 2006-02-04 aradke: eliminated titleitem */ if (!newchildwindow (idaboutconfig, nil, &rwindow, &rzoom, bstitle, &w)) { Modified: Frontier/trunk/Common/source/cancoon.c =================================================================== --- Frontier/trunk/Common/source/cancoon.c 2006-04-12 17:45:59 UTC (rev 1253) +++ Frontier/trunk/Common/source/cancoon.c 2006-04-12 20:27:14 UTC (rev 1254) @@ -635,7 +635,7 @@ shellgetstring (openolddatabasestring, bsprompt); - if (!twowaydialog (bsprompt, "\x07" "Convert", "\x06" "Cancel")) + if (!twowaydialog (bsprompt, BIGSTRING ("\x07" "Convert"), BIGSTRING ("\x06" "Cancel"))) return (false); dbrefheapstring (info.adrscriptstring, &hstring); Modified: Frontier/trunk/Common/source/cancoonwindow.c =================================================================== --- Frontier/trunk/Common/source/cancoonwindow.c 2006-04-12 17:45:59 UTC (rev 1253) +++ Frontier/trunk/Common/source/cancoonwindow.c 2006-04-12 20:27:14 UTC (rev 1254) @@ -461,7 +461,7 @@ cb = cancooncallbacks; /*copy into register*/ if (!shellfindcallbacks (idtableconfig, &ixtableconfig)) - shellerrormessage ("\x24" "must initialize table before cancoon"); + shellerrormessage (BIGSTRING ("\x24" "must initialize table before cancoon")); *cb = globalsarray [ixtableconfig]; // start with table callbacks Modified: Frontier/trunk/Common/source/claybrowserstruc.c =================================================================== --- Frontier/trunk/Common/source/claybrowserstruc.c 2006-04-12 17:45:59 UTC (rev 1253) +++ Frontier/trunk/Common/source/claybrowserstruc.c 2006-04-12 20:27:14 UTC (rev 1254) @@ -92,7 +92,7 @@ if (suffixnum > 0) { - pushstring ("\x02" " #", name); + pushstring (BIGSTRING ("\x02" " #"), name); pushint (suffixnum, name); } @@ -106,7 +106,7 @@ if (suffixnum > 0) { - copystring ("\x02" " #", bssuffix); + copystring (BIGSTRING ("\x02" " #"), bssuffix); pushint (suffixnum, bssuffix); @@ -191,22 +191,22 @@ if (newlen <= (short) (**outlinedata).maxlinelen) return (true); - copystring ("\x0e" "The file name ", bsalert); + copystring (BIGSTRING ("\x0e" "The file name "), bsalert); if (stringlength (bs) > 0) { - pushstring ("\x01" "\xD2", bsalert); + pushstring (BIGSTRING ("\x01" "\xD2"), bsalert); pushstring (bs, bsalert); - pushstring ("\x01" "\xD3", bsalert); + pushstring (BIGSTRING ("\x01" "\xD3"), bsalert); } - pushstring ("\x2e" " is too long. The maximum file name length is ", bsalert); + pushstring (BIGSTRING ("\x2e" " is too long. The maximum file name length is "), bsalert); pushlong ((**outlinedata).maxlinelen, bsalert); - pushstring ("\x0c" " characters.", bsalert); + pushstring (BIGSTRING ("\x0c" " characters."), bsalert); alertdialog (bsalert); @@ -362,7 +362,7 @@ #if filebrowser return (false); #else - copystring ("\x04" "item", origname); + copystring (BIGSTRING ("\x04" "item"), origname); flmustsuffixize = true; #endif } @@ -403,7 +403,7 @@ if (folderfound) return (true); - folderfound = claygetspecialfolder ("\x04" "Undo", true, &undofolderspec); + folderfound = claygetspecialfolder (BIGSTRING ("\x04" "Undo"), true, &undofolderspec); return (folderfound); } /*getundofolderspec*/ @@ -416,7 +416,7 @@ if (folderfound) return (true); - folderfound = claygetspecialfolder ("\x09" "Clipboard", true, &clipfolderspec); + folderfound = claygetspecialfolder (BIGSTRING ("\x09" "Clipboard"), true, &clipfolderspec); return (folderfound); } /*getclipfolderspec*/ @@ -682,9 +682,9 @@ opcleartmpbits (); #ifdef MACVERSION - parsedialogstring ("\x3b" "Can\xD5t move \xD2^0\xD3 here because it would replace its ancestor.", bsunsafe, nil, nil, nil, bsmsg); + parsedialogstring (BIGSTRING ("\x3b" "Can\xD5t move \xD2^0\xD3 here because it would replace its ancestor."), bsunsafe, nil, nil, nil, bsmsg); #else - parsedialogstring ("\x3b" "Can't move \"^0\" here because it would replace its ancestor.", bsunsafe, nil, nil, nil, bsmsg); + parsedialogstring (BIGSTRING ("\x3b" "Can't move \"^0\" here because it would replace its ancestor."), bsunsafe, nil, nil, nil, bsmsg); #endif alertdialog (bsmsg); @@ -768,7 +768,7 @@ bigstring bs; - copystring ("\x20" "Copy or move the selected items?", bs); + copystring (BIGSTRING ("\x20" "Copy or move the selected items?"), bs); // return (twowaydialog (bs, "\x04" "Copy", "\x04" "Move")); return (msgdialog (bs)); Modified: Frontier/trunk/Common/source/claybrowservalidate.c =================================================================== --- Frontier/trunk/Common/source/claybrowservalidate.c 2006-04-12 17:45:59 UTC (rev 1253) +++ Frontier/trunk/Common/source/claybrowservalidate.c 2006-04-12 20:27:14 UTC (rev 1254) @@ -385,7 +385,7 @@ if (hfolder == hdest) { - alertdialog ("\x32" "Can\xD5t paste at the top level of a browser outline."); + alertdialog (BIGSTRING ("\x32" "Can\xD5t paste at the top level of a browser outline.")); return (false); } @@ -440,7 +440,7 @@ if ((**hfolder).headlinkleft == hfolder) { - alertdialog ("\x32" "Can\xD5t paste at the top level of a browser outline."); + alertdialog (BIGSTRING ("\x32" "Can\xD5t paste at the top level of a browser outline.")); return (false); } @@ -453,7 +453,7 @@ folderloop (clipfolderspec, false, &validatepastecallback, &draginfo); - return (browsercollisiondialog (hfolder, "\x07" "pasting")); + return (browsercollisiondialog (hfolder, BIGSTRING ("\x07" "pasting"))); } /*browservalidatefolderpaste*/ #endif @@ -477,15 +477,15 @@ if (!equalidentifiers (bsnode, bs)) return (true); - copystring ("\x06" "Can\xD5t ", bs); + copystring (BIGSTRING ("\x06" "Can\xD5t "), bs); pushstring (pcommand, bs); - pushstring ("\x35" " because there are two or more selected items named \xD2", bs); + pushstring (BIGSTRING ("\x35" " because there are two or more selected items named \xD2"), bs); pushstring (bsnode, bs); - pushstring ("\x02" "\xD3.", bs); + pushstring (BIGSTRING ("\x02" "\xD3."), bs); alertdialog (bs); Modified: Frontier/trunk/Common/source/claycallbacks.c =================================================================== --- Frontier/trunk/Common/source/claycallbacks.c 2006-04-12 17:45:59 UTC (rev 1253) +++ Frontier/trunk/Common/source/claycallbacks.c 2006-04-12 20:27:14 UTC (rev 1254) @@ -203,7 +203,7 @@ if (!claygetdirid (fsto, &hdest)) { - langerrormessage ("\x1b" "destination must be a table"); + langerrormessage (BIGSTRING ("\x1b" "destination must be a table")); return (false); } @@ -448,7 +448,7 @@ #if filebrowser tybrowserspec fsuserland, fsfolder; - if (!filegetprefsspec ("\x08" "UserLand", &fsuserland)) + if (!filegetprefsspec (BIGSTRING ("\x08" "UserLand"), &fsuserland)) return (false); if (!clayfileexists (&fsuserland, &flfolder)) { @@ -457,7 +457,7 @@ return (false); } - if (!claygetsubitemspec (&fsuserland, "\x12" "Clay Basket Folder", &fsfolder)) + if (!claygetsubitemspec (&fsuserland, BIGSTRING ("\x12" "Clay Basket Folder"), &fsfolder)) return (false); if (!clayfileexists (&fsfolder, &flfolder)) { @@ -881,7 +881,7 @@ if (stringlength (bs) > 0) { - pushstring ("\x01" " ", bs); + pushstring (BIGSTRING ("\x01" " "), bs); alllower (adj); } @@ -899,32 +899,32 @@ setstringlength (bs, 0); if ((*info).flejectable) - pushadjective ("\x09" "Removable", bs); + pushadjective (BIGSTRING ("\x09" "Removable"), bs); if ((*info).flhardwarelock) - pushadjective ("\x09" "Read-only", bs); + pushadjective (BIGSTRING ("\x09" "Read-only"), bs); if ((*info).flremotevolume) - pushadjective ("\x06" "Shared", bs); + pushadjective (BIGSTRING ("\x06" "Shared"), bs); if (stringlength (bs) > 0) - pushstring ("\x05" " disk", bs); + pushstring (BIGSTRING ("\x05" " disk"), bs); else - copystring ("\x04" "Disk", bs); + copystring (BIGSTRING ("\x04" "Disk"), bs); return; } if ((*info).flfolder) { - copystring ("\x06" "Folder", bs); + copystring (BIGSTRING ("\x06" "Folder"), bs); return; } if ((*info).flalias) { - copystring ("\x05" "Alias", bs); + copystring (BIGSTRING ("\x05" "Alias"), bs); return; } @@ -932,12 +932,12 @@ switch ((*info).filecreator) { case 'DMGR': case 'ERIK': - copystring ("\x14" "Desktop Manager file", bs); + copystring (BIGSTRING ("\x14" "Desktop Manager file"), bs); return; case 'MACS': - copystring ("\x0f" "System Software", bs); + copystring (BIGSTRING ("\x0f" "System Software"), bs); return; } /*switch*/ @@ -945,42 +945,42 @@ switch ((*info).filetype) { case 'APPL': - copystring ("\x13" "Application program", bs); + copystring (BIGSTRING ("\x13" "Application progr... [truncated message content] |
