shadowirc-commits Mailing List for ShadowIRC
Status: Alpha
Brought to you by:
dshadow
You can subscribe to this list here.
2002 |
Jan
|
Feb
(66) |
Mar
(54) |
Apr
(10) |
May
(87) |
Jun
(15) |
Jul
(4) |
Aug
(92) |
Sep
(33) |
Oct
(114) |
Nov
(31) |
Dec
(12) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2003 |
Jan
(7) |
Feb
(7) |
Mar
(8) |
Apr
(36) |
May
(11) |
Jun
(31) |
Jul
(14) |
Aug
(4) |
Sep
(1) |
Oct
(5) |
Nov
(7) |
Dec
(26) |
2004 |
Jan
(30) |
Feb
(4) |
Mar
(4) |
Apr
(4) |
May
(6) |
Jun
(25) |
Jul
(9) |
Aug
(44) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
2005 |
Jan
(12) |
Feb
(3) |
Mar
(1) |
Apr
|
May
(17) |
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
From: John B. <ds...@us...> - 2009-09-04 02:18:54
|
Update of /cvsroot/shadowirc/shadowirc/src/lib In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv27552/src/lib Modified Files: TCPStuff.c Log Message: PATH_MAX instead of MAXPATHLEN Index: TCPStuff.c =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/src/lib/TCPStuff.c,v retrieving revision 1.70 retrieving revision 1.71 diff -u -d -r1.70 -r1.71 --- TCPStuff.c 1 May 2005 05:30:11 -0000 1.70 +++ TCPStuff.c 4 Sep 2009 02:18:32 -0000 1.71 @@ -389,7 +389,7 @@ static int ident_bind(void) { int fd = -1, sockfd[2], status; - char c, path[MAXPATHLEN]; + char c, path[PATH_MAX]; CFBundleRef bundle; CFURLRef resources, toolURL; pid_t pid; @@ -408,7 +408,7 @@ if(!toolURL) return FALSE; - CFURLGetFileSystemRepresentation(toolURL, TRUE, (UInt8 *) &path, MAXPATHLEN); + CFURLGetFileSystemRepresentation(toolURL, TRUE, (UInt8 *) &path, PATH_MAX); CFRelease(toolURL); if(socketpair(AF_LOCAL, SOCK_STREAM, 0, sockfd) != 0) |
From: John B. <ds...@us...> - 2005-06-09 08:38:28
|
Update of /cvsroot/shadowirc/shadowirc/ShadowIRC.pbproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9901/ShadowIRC.pbproj Modified Files: project.pbxproj Log Message: Not sure when this got removed, but, simpleList.c needs to be built... Index: project.pbxproj =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/ShadowIRC.pbproj/project.pbxproj,v retrieving revision 1.65 retrieving revision 1.66 diff -u -d -r1.65 -r1.66 --- project.pbxproj 1 May 2005 06:17:07 -0000 1.65 +++ project.pbxproj 9 Jun 2005 08:38:19 -0000 1.66 @@ -901,6 +901,7 @@ buildRules = ( ); buildSettings = { + EXPORTED_SYMBOLS_FILE = ""; FRAMEWORK_SEARCH_PATHS = ""; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -911,9 +912,9 @@ INSTALL_PATH = /Applications; LIBRARY_SEARCH_PATHS = ""; OTHER_CFLAGS = "-Wall"; + OTHER_LDFLAGS = ""; OTHER_REZFLAGS = ""; PRODUCT_NAME = ShadowIRC; - SECTORDER_FLAGS = ""; WARNING_CFLAGS = "-Wmost"; WRAPPER_EXTENSION = app; ZERO_LINK = YES; @@ -1454,13 +1455,13 @@ F4BBC2EF056EE75900BD6D17, F4BBC2F0056EE75900BD6D17, F4BBC2F1056EE75900BD6D17, - F4BBC2F2056EE75900BD6D17, F40147C506C95EA200376EB2, F40147ED06C965D200376EB2, F40148B106CABC0800376EB2, F4DB9CBB06CB359D00B575DC, F497A66106D0E28B00AACA2B, F45EAB1707976109003FFFE4, + F4CA827508583665003BAD91, ); isa = PBXSourcesBuildPhase; runOnlyForDeploymentPostprocessing = 0; @@ -1843,12 +1844,6 @@ settings = { }; }; - F4BBC2F2056EE75900BD6D17 = { - fileRef = F47F2278056B37EE00A7C307; - isa = PBXBuildFile; - settings = { - }; - }; F4BBC2F3056EE75900BD6D17 = { buildActionMask = 2147483647; files = ( @@ -1920,6 +1915,12 @@ refType = 3; sourceTree = BUILT_PRODUCTS_DIR; }; + F4CA827508583665003BAD91 = { + fileRef = F47F2278056B37EE00A7C307; + isa = PBXBuildFile; + settings = { + }; + }; F4DB9CBB06CB359D00B575DC = { fileRef = F552BF400211030901A80061; isa = PBXBuildFile; |
From: John B. <ds...@us...> - 2005-06-09 08:29:10
|
Update of /cvsroot/shadowirc/shadowirc/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4682/src Modified Files: CTCP.c Log Message: Meh. forgot to bump the (c) date. Index: CTCP.c =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/src/CTCP.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- CTCP.c 6 Mar 2004 03:58:57 -0000 1.15 +++ CTCP.c 9 Jun 2005 08:28:47 -0000 1.16 @@ -1,6 +1,6 @@ /* ShadowIRC - A Mac OS IRC Client - Copyright (C) 1996-2004 John Bafford + Copyright (C) 1996-2005 John Bafford ds...@sh... http://www.shadowirc.com @@ -290,7 +290,7 @@ } else if(pstrcmp(co, "\pVERSION")) { - LSConcatStrAndStrAndStr("\pShadowIRC ", CL_VERSION, "\p © John Bafford 1996-2004 (", &ls); + LSConcatStrAndStrAndStr("\pShadowIRC ", CL_VERSION, "\p © John Bafford 1996-2005 (", &ls); LSConcatLSAndStrAndStr(&ls, cdt, "\p)", &ls); CTCPSendReply(link, fr, co, &ls); } |
From: John B. <ds...@us...> - 2005-06-09 08:26:12
|
Update of /cvsroot/shadowirc/shadowirc/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2913/src Modified Files: utils.c Log Message: Seems like now is as good a time as any to remove the unused asm string functions... Index: utils.c =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/src/utils.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- utils.c 17 Jan 2004 15:46:21 -0000 1.21 +++ utils.c 9 Jun 2005 08:25:53 -0000 1.22 @@ -1,6 +1,6 @@ /* ShadowIRC - A Mac OS IRC Client - Copyright (C) 1996-2004 John Bafford + Copyright (C) 1996-2005 John Bafford ds...@sh... http://www.shadowirc.com @@ -28,8 +28,6 @@ #include "utils.h" #include "ApplBase.h" -#define USE_SHADOWIRC_ASSEMBLY 0 - inline char inupc(char c); static char matchFrom(ConstStr255Param s, ConstStr255Param mask, int i, int j); @@ -408,7 +406,6 @@ } } -#if !USE_SHADOWIRC_ASSEMBLY pascal char pstrcmp(ConstStr255Param s1, ConstStr255Param s2) { int x=s1[0]; @@ -422,114 +419,7 @@ return 1; return 0; //getting here is an error. return zero! } -#else -asm pascal char pstrcmp(register ConstStr255Param s1, register ConstStr255Param s2) -{ - #pragma unused(s1, s2) - lbz r5, 0(r3); //Get the byte counts of both strings - lbz r6, 0(r4); - cmpw r5, r6; //If the two lengths aren't the same, fail immediately - bne @fail - - addi r5, r5, 1; //Increment the length to include the length byte (for alignment) - - //If the length is <= 12, we can complete the comparison in one pass, - //using r6..r8 and r10..r12 as scratch registers - - cmpwi r5, 12; - ble+ @lessThanTwelveBytes; - -@twelveOrMoreBytes: - // OK...12 or more bytes to compare. We'll compare 12 bytes and then see if we can finish. - - lwz r6, 0(r3) - lwz r7, 4(r3) - lwz r8, 8(r3) - - lwz r10, 0(r4) - lwz r11, 4(r4) - lwz r12, 8(r4) - - addi r3, r3, 12; //Increment strings by 12 - addi r4, r4, 12; - subi r5, r5, 12; //Decrement size - - //Compare each of the register pairs R6/R10, R7/R11, R8/R12. If any differs, exit. - cmp cr1, 0, r6, r10; - cmp cr2, 0, r7, r11 - cmp cr3, 0, r8, r12 - - bne cr1, @fail - bne cr2, @fail - bne cr3, @fail - - cmpwi r5, 12; //If we have more than 12, go back up and do the next 12. Else, continue... - bge @twelveOrMoreBytes - -@lessThanTwelveBytes: //test8 - mtcrf 1, r5 //set CR7 with 8/4/2/1 testers - bf 28, @test4 //if less than 8 left, skip - - lwz r6, 0(r3) - lwz r7, 4(r3) - - lwz r10, 0(r4) - lwz r11, 4(r4) - - addi r3, r3, 8 - addi r4, r4, 8 - - cmp cr1, 0, r6, r10; - cmp cr2, 0, r7, r11 - - bne cr1, @fail - bne cr2, @fail - -@test4: - bf 29, @test2 //if less than 4 left, skip - - lwz r6, 0(r3) - lwz r10, 0(r4) - - addi r3, r3, 4 - addi r4, r4, 4 - - cmp cr1, 0, r6, r10; - bne cr1, @fail - -@test2: - bf 30, @test1 //if less than 2 left, skip - - lhz r6, 0(r3) - lhz r10, 0(r4) - - addi r3, r3, 2 - addi r4, r4, 2 - - cmp cr1, 0, r6, r10; - bne cr1, @fail - -@test1: - bf 31, @succ //if less than 1 left, skip - - lbz r6, 0(r3) - lbz r10, 0(r4) - - cmp cr1, 0, r6, r10; - bne cr1, @fail - -@succ: - li r3, 1 - blr - -@fail: - li r3, 0 - blr -} -#endif - -#if !USE_SHADOWIRC_ASSEMBLY inline char inupc(char c) { if((c>='a') && (c<='z')) @@ -550,52 +440,7 @@ return 1; } -#else -asm pascal char pstrcasecmp(register ConstStr255Param s1, register ConstStr255Param s2) -{ - #pragma unused(s1, s2) - lbz r5, 0(r3) //Get lengths - lbz r6, 0(r4) - mtctr r5 //set the counter here to decrease stalls - cmpw r5, r6 //s1[0] == s2[0] - beq @loop //if equal, branch - -@notEqual: - li r3, 0 //else return 0 - blr - -@loop: - lbz r5, 1(r3) //read next character and increment strings - addi r3, r3, 1 - lbz r6, 1(r4) - addi r4, r4, 1 - - cmplwi r5, 'a' //See if first char is lowercase - blt @nextA - cmplwi r5, 'z' - bgt @nextA - - subi r5, r5, 32 //If it is, uppercase - -@nextA: - cmplwi r6, 'a' //See if second char is lowercase - blt @nextB - cmplwi r6, 'z' - bgt @nextB - - subi r6, r6, 32 //If it is, uppercase - -@nextB: - cmpw r5, r6 //Compare two strings - bne @notEqual //If not equal, need to return zero - bdnz @loop //decrement counter and loop - - li r3, 1 - blr -} -#endif -#if !USE_SHADOWIRC_ASSEMBLY pascal char pstrcasecmp2(ConstStr255Param s1, ConstStr255Param s2) { int x, z; @@ -609,42 +454,6 @@ return 1; } -#else -asm pascal char pstrcasecmp2(register ConstStr255Param s1, register ConstStr255Param s2) -{ - #pragma unused(s1, s2) - lbz r5, 0(r3) //Get lengths - lbz r6, 0(r4) - mtctr r5 //set the counter here to decrease stalls - cmpw r5, r6 //s1[0] == s2[0] - beq @loop //if equal, branch - -@notEqual: - li r3, 0 //else return 0 - blr - -@loop: - lbz r6, 1(r4) - addi r4, r4, 1 - lbz r5, 1(r3) //read next character and increment strings - addi r3, r3, 1 - - cmplwi r6, 'a' //See if second char is lowercase - blt @nextB - cmplwi r6, 'z' - bgt @nextB - - subi r6, r6, 32 //If it is, uppercase - -@nextB: - cmpw r5, r6 //Compare two strings - bne @notEqual //If not equal, need to return zero - bdnz @loop //decrement counter and loop - - li r3, 1 - blr -} -#endif pascal OSErr ParamString(StringPtr str, ConstStr255Param r0, ConstStr255Param r1, ConstStr255Param r2, ConstStr255Param r3) { @@ -786,7 +595,6 @@ str[x]-=32; } -#if !USE_SHADOWIRC_ASSEMBLY pascal void pstrcpyucase(ConstStr255Param src, Str255 dest) { int x; @@ -796,41 +604,6 @@ for(x=1;x<=n;x++) dest[x]=inupc(src[x]); } -#else -asm pascal void pstrcpyucase(register ConstStr255Param src, register Str255 dest) -{ - #pragma unused(src, dest) - lbz r5, 0(r3) //copy string length - - stb r5, 0(r4) //dest[0] = src[0] - - cmpwi r5, 1 //is src[0] < 1? - bltlr //if it is, return - - mtctr r5 //copy length to counter - - lbz r5, 1(r3) //load first character of string - addi r3, r3, 1 //increment strings - addi r4, r4, 1 - -@loop: - cmplwi r5, 'a' //check to see if 'a' <= r5 <= 'z' - blt @next - cmplwi r5, 'z' - bgt @next - - subi r5, r5, 32 //it is, so r5 -= 32 - -@next: - stb r5, 0(r4) //put r5 into string - addi r3, r3, 1 //increment r3 - lbz r5, 0(r3) //read next character - addi r4, r4, 1 //increment r4 - bdnz @loop //loop - - blr //return -} -#endif pascal unsigned short countChar(short c, const ConstStr255Param s) { @@ -845,7 +618,6 @@ return count; } -#if !USE_SHADOWIRC_ASSEMBLY pascal unsigned short revPos(short c, ConstStr255Param s) { int x=s[0]; @@ -856,37 +628,7 @@ return 0; } -#else -asm pascal unsigned short revPos(register short c, register ConstStr255Param s) -{ - #pragma unused(c, s) - clrlwi r6, r3, 24 //Copy char to r6 and zero high three bytes - lbz r3, 0(r4) //load length byte - lbzx r7, r3, r4 //load last character - cmplwi r3, 1 //If less than, return 0 - blt @notFound - - mtctr r3 - add r4, r4, r3 //Move to end of string - -@top: - cmpw r6, r7 - bne+ @loop //no match. branch. assume likely to branch - blr //found. return. - -@loop: - lbz r7 , -1(r4) //Load next character - subi r4, r4, 1 //decrement string - subi r3, r3, 1 //decrement x - bdnz @top //continue loop if more string - -@notFound: - li r3, 0 //not found - blr -} -#endif -#if !USE_SHADOWIRC_ASSEMBLY pascal char isNumber(ConstStr255Param s) { int n=s[0], x; @@ -897,38 +639,6 @@ return true; } -#else -asm pascal char isNumber(register ConstStr255Param s) -{ - #pragma unused(s) - lbz r0, 0(r3) //Save length - mtctr r0 //put r0 in counter (assume it's likely to be >=1) - - cmpwi r0, 1 //if length < 1 - blt @nan //it's not a number - - lbz r0, 1(r3) //read in first character - addi r3, r3, 1 //move to first character - -@loop: - cmplwi r0, '0' //is it less than zero? - blt @nan //if so, it's not a number - cmplwi r0, '9' //is it <= 9? - ble @next //if so, iterate - -@nan: - li r3, 0 //return 0 - blr - -@next: - lbz r0, 1(r3) //Read next character. (better for pipelining up here) - addi r3, r3, 1 //Increment string - bdnz @loop //decrement count and loop if more - - li r3, 1 //return 1 - blr -} -#endif pascal long IPStringToLong(ConstStr255Param s) { @@ -974,7 +684,6 @@ return((n>=7)&&(n<=15)); } -#if !USE_SHADOWIRC_ASSEMBLY pascal unsigned short pos(short c, ConstStr255Param s) { int x; @@ -986,34 +695,6 @@ return 0; } -#else -asm pascal unsigned short pos(register short c, register ConstStr255Param s) -{ - #pragma unused(c, s) - lbz r0, 0(r4) //copy length to r0 - rlwinm r5, r3, 0, 24, 31 //copy low-8 of r3 to r5 - - cmpwi r0, 1 //If length < 1, return false - blt @notFound - - addi r4, r4, 1 //increment to next position in string - li r3, 1 //start at pos 1 in r3 - mtctr r0 //Set counter to length - -@loop - lbz r0, 0(r4) //Load character - addi r4, r4, 1 //increment to next position in string - cmplw r5, r0 //compare character - beqlr //If they match, return - - addi r3, r3, 1 //Increment the count - bdnz @loop - -@notFound: - li r3, 0 //return 0 - blr -} -#endif /* char MaskMatchC(const char* s, const char* mask) |
From: John B. <ds...@us...> - 2005-06-09 08:26:11
|
Update of /cvsroot/shadowirc/shadowirc/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2913/src/lib Modified Files: LongStrings.c Log Message: Seems like now is as good a time as any to remove the unused asm string functions... Index: LongStrings.c =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/src/lib/LongStrings.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- LongStrings.c 1 May 2005 04:47:39 -0000 1.15 +++ LongStrings.c 9 Jun 2005 08:25:54 -0000 1.16 @@ -24,8 +24,6 @@ #include "LongStrings.h" #include "Inline.h" -#define USE_SHADOWIRC_ASSEMBLY 0 - pascal void LSDupe(const LongString * const l1, LongString *l2) { int len; @@ -39,7 +37,6 @@ BlockMoveData(l1, l2, len); } -#if !USE_SHADOWIRC_ASSEMBLY pascal char LSCmp(const LongString *ls1, const LongString *ls2) { int x, y; @@ -59,150 +56,6 @@ return 1; } } -#else -asm pascal char LSCmp(register const LongString *ls1, register const LongString *ls2) -{ - #pragma unused(ls1, ls2) - lhz r5, 0(r3) //Get the byte counts of both strings - lhz r6, 0(r4) - - cmpw r5, r6 //If the two lengths aren't the same, fail immediately - beq @more -@fail: - li r3, 0 - blr - -@more: - cmpwi r5, 1 //If the length is less than one succeed. - blt @succ - - //Test the first byte of each string. - lbz r6, 3(r3) - lbz r7, 3(r4) - - cmpw r6, r7 //If not the same, fail - bne @fail - - subi r5, r5, 1 //Decrement length to check by one - addi r3, r3, 4 //Increment strings to ls->data[2] - addi r4, r4, 4 - - //If the length is <= 12, we can complete the comparison in one pass, - //using r6..r8 and r10..r12 as scratch registers - cmpwi r5, 12 - ble+ @lessThanTwelveBytes - -@twelveOrMoreBytes: - // OK...more than 1 bytes to compare. We'll compare 12 bytes and then see if we can finish. - - lwz r6, 0(r3) - lwz r7, 4(r3) - lwz r8, 8(r3) - - lwz r10, 0(r4) - lwz r11, 4(r4) - lwz r12, 8(r4) - - subi r5, r5, 12 //Decrement size - addi r3, r3, 12 //Increment strings by 12 - addi r4, r4, 12 - - //Compare each of the register pairs R6/R10, R7/R11, R8/R12. If any differs, exit. - cmp cr1, 0, r6, r10 - cmp cr2, 0, r7, r11 - cmp cr3, 0, r8, r12 - - bne cr1, @fail - bne cr2, @fail - bne cr3, @fail - - cmpwi r0, 12 //If we have more than 12, go back up and do the next 16. Else, continue... - bge @twelveOrMoreBytes - -@lessThanTwelveBytes: - mtcrf 1, r5 //set CR7 with 8/4/2/1 testers - bf 28, @test4 //if less than 8 left, skip - - lwz r6, 0(r3) - lwz r7, 4(r3) - - lwz r10, 0(r4) - lwz r11, 4(r4) - - addi r3, r3, 8 - addi r4, r4, 8 - - cmp cr1, 0, r6, r10; - cmp cr2, 0, r7, r11 - - bne cr1, @fail - bne cr2, @fail - -@test4: - bf 29, @test2 //if less than 4 left, skip - - lwz r6, 0(r3) - lwz r10, 0(r4) - - addi r3, r3, 4 - addi r4, r4, 4 - - cmp cr1, 0, r6, r10; - bne cr1, @fail - -@test2: - bf 30, @test1 //if less than 2 left, skip - - lhz r6, 0(r3) - lhz r10, 0(r4) - - addi r3, r3, 2 - addi r4, r4, 2 - - cmp cr1, 0, r6, r10; - bne cr1, @fail - -@test1: - bf 31, @succ //if less than 1 left, skip - - lbz r6, 0(r3) - lbz r10, 0(r4) - - cmp cr1, 0, r6, r10; - bne cr1, @fail - -/* - // We complete the comparison here, comparing between 1 and 11 bytes. If r5 is zero, we succeed immediately. - cmpwi r5, 0 - beq @succ - - mr r0,r5 //Copy length to r0 - mtxer r0 //Copy the length to XER register. - - lswx r5, r0, r3 //Load the strings into R5..R7 and R9..R11. - lswx r9, r0, r4 - - cmp cr0, 0, r5, r9 //Compare R5 against R9; if they differ, fail. Succed If r0 is <= 4. - cmpi cr1, 0, r0, 4 - - bne cr0, @fail - ble cr1, @succ - - cmp cr0, 0, r6, r10 //Compare R6 against R10; fail if different. Succeed if r0 <= 8. - cmpi cr1, 0, r0, 8 - - bne cr0, @fail - ble cr1, @succ - - cmpw r7, r11 //Compare R7 against R11; fail if different. succeed if same. - bne @fail -*/ - -@succ: - li r3, 1 - blr -} -#endif static inline char inupc(char c); static inline char inupc(char c) @@ -212,7 +65,6 @@ return c; } -#if !USE_SHADOWIRC_ASSEMBLY pascal char LSCaseCmp(const LongString *ls1, const LongString *ls2) { int x, y; @@ -232,57 +84,6 @@ return 1; } } -#else -asm pascal char LSCaseCmp(register const LongString *ls1, register const LongString *ls2) -{ - #pragma unused(ls1, ls2) - lhz r5, 0(r3) //Get lengths - lhz r6, 0(r4) - mtctr r5 - cmpw r5, r6 //s1[0] == s2[0] - beq @more //if equal, branch - -@notEqual: - li r3, 0 //else return 0 - blr - -@more - lbz r5, 3(r3) //read next character and increment strings - addi r3, r3, 3 - lbz r6, 3(r4) - addi r4, r4, 3 -@loop: - cmplwi r5, 'a' //See if first char is lowercase - blt @nextA - cmplwi r5, 'z' - bgt @nextA - - subi r5, r5, 32 //If it is, uppercase - -@nextA: - cmplwi r6, 'a' //See if second char is lowercase - blt @nextB - cmplwi r6, 'z' - bgt @nextB - - subi r6, r6, 32 //If it is, uppercase - -@nextB: - cmpw r5, r6 //Compare two strings - bne @notEqual //If not equal, need to return zero - bdz @finish //decrement counter if zero, finish, otherwise, continue - - lbz r5, 1(r3) //read next character and increment strings - addi r3, r3, 1 - lbz r6, 1(r4) - addi r4, r4, 1 - b @loop - -@finish: - li r3, 1 - blr -} -#endif pascal void LSDelete(LongString *ls, short firstpos, short lastpos) { @@ -499,7 +300,6 @@ LSCopyString(ls,1,ls->len, arg); } -#if !USE_SHADOWIRC_ASSEMBLY pascal short LSPosChar(short c, const LongString *ls) { int i=1; @@ -511,34 +311,6 @@ //else return 0; } -#else -asm pascal short LSPosChar(register short c, register const LongString *ls) -{ - #pragma unused(c, ls) - lhz r0, 0(r4) //copy length to r0 - rlwinm r5, r3, 0, 24, 31 //copy low-8 of r3 to r5 - - cmpwi r0, 1 //If length < 1, return false - blt @notFound - - li r3, 1 //start at pos 1 in r3 - mtctr r0 //Set counter to length - - addi r4, r4, 3 //move to ls->data[1] = sizeof(short) + sizeof(char) -@loop - lbz r0, 0(r4) //Load character - cmplw r5, r0 //compare character - beqlr //If they match, return - - addi r3, r3, 1 //Increment the count - addi r4, r4, 1 //increment to next position in string - bdnz @loop - -@notFound: - li r3, 0 //return 0 - blr -} -#endif pascal void LSStrLS(ConstStr255Param s, LongString *ls) { |
From: Sean M. <smc...@us...> - 2005-05-01 07:04:25
|
Update of /cvsroot/shadowirc/shadowirc/src/waste/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13220 Modified Files: WEInlineInput.c Log Message: This should keep the WASTE bits building on Panther. Index: WEInlineInput.c =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/src/waste/src/WEInlineInput.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- WEInlineInput.c 1 May 2005 04:41:03 -0000 1.5 +++ WEInlineInput.c 1 May 2005 07:04:16 -0000 1.6 @@ -11,7 +11,7 @@ * */ - +#include <AvailabilityMacros.h> #include "WASTEIntf.h" // special event ID used by Kotoeri and other input methods @@ -30,6 +30,11 @@ static AEEventHandlerUPP _weOffsetToPositionHandler = nil; static AEEventHandlerUPP _weGetTextHandler = nil; +#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3 +#define kTSMHiliteCaretPosition kCaretPosition +#define kTSMHiliteRawText kRawText +#endif + pascal OSErr _WEHiliteRangeArray(TextRangeArrayHandle hTray, WEHandle hWE) { WEPtr pWE = *hWE; // assume WE record is already locked |
From: John B. <ds...@us...> - 2005-05-01 06:17:16
|
Update of /cvsroot/shadowirc/shadowirc/ShadowIRC.pbproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23523/ShadowIRC.pbproj Modified Files: project.pbxproj Log Message: Build Error: Disable -mdynamic-no-pic on development build: it should not be turned on for plugins, and the target setting isn't overriding the build style. Index: project.pbxproj =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/ShadowIRC.pbproj/project.pbxproj,v retrieving revision 1.64 retrieving revision 1.65 diff -u -d -r1.64 -r1.65 --- project.pbxproj 25 Jan 2005 13:07:04 -0000 1.64 +++ project.pbxproj 1 May 2005 06:17:07 -0000 1.65 @@ -8,7 +8,7 @@ 05952DFCFFF02D1B11CA0E50 = { buildSettings = { COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = YES; + GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 0; |
From: John B. <ds...@us...> - 2005-05-01 05:59:42
|
Update of /cvsroot/shadowirc/shadowirc/src/plugins/hilight In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14419/src/plugins/hilight Modified Files: Highlight.c Log Message: Compiler warning: no previous prototype Index: Highlight.c =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/src/plugins/hilight/Highlight.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- Highlight.c 1 May 2005 04:35:55 -0000 1.12 +++ Highlight.c 1 May 2005 05:59:31 -0000 1.13 @@ -93,6 +93,8 @@ /* ** ****************************************************** ** */ +inline char IsWS(char c); + inline char IsWS(char c) { if(c==' ' || c== 10 || c==13 || c=='\t') |
From: John B. <ds...@us...> - 2005-05-01 05:59:42
|
Update of /cvsroot/shadowirc/shadowirc/src/plugins/userlist In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14419/src/plugins/userlist Modified Files: userlist.c Log Message: Compiler warning: no previous prototype Index: userlist.c =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/src/plugins/userlist/userlist.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- userlist.c 1 May 2005 04:35:55 -0000 1.35 +++ userlist.c 1 May 2005 05:59:31 -0000 1.36 @@ -606,6 +606,7 @@ #pragma mark - +/* inline void RepeatMunger(Handle text, long offset, const void* ptr1, long len1, const void* ptr2, long len2) { int i; @@ -613,6 +614,7 @@ i = Munger(text, offset, ptr1, len1, ptr2, len2); } while(i >= 0); } +*/ static void ProcessShortcuts(pShortcutProcessData *p) { @@ -851,7 +853,7 @@ } } -void DBCustomDrawItem(ControlRef browser, DataBrowserItemID item, DataBrowserPropertyID property, DataBrowserItemState itemState, const Rect* theRect, SInt16 gdDepth, Boolean colorDevice) +static void DBCustomDrawItem(ControlRef browser, DataBrowserItemID item, DataBrowserPropertyID property, DataBrowserItemState itemState, const Rect* theRect, SInt16 gdDepth, Boolean colorDevice) { UserListPtr user = (UserListPtr)item; |
From: John B. <ds...@us...> - 2005-05-01 05:35:26
|
Update of /cvsroot/shadowirc/shadowirc/src/ident_tool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2149/src/ident_tool Modified Files: ident_tool.c Log Message: Compiler warning: no previous prototype Index: ident_tool.c =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/src/ident_tool/ident_tool.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ident_tool.c 30 Jul 2003 06:05:00 -0000 1.4 +++ ident_tool.c 1 May 2005 05:35:18 -0000 1.5 @@ -16,7 +16,10 @@ #include <sys/socket.h> #include <netdb.h> -ssize_t write_fd(int fd, void *ptr, size_t nbytes, int sendfd) { +ssize_t write_fd(int fd, void *ptr, size_t nbytes, int sendfd); + +ssize_t write_fd(int fd, void *ptr, size_t nbytes, int sendfd) +{ struct msghdr msg; struct iovec iov[1]; |
From: John B. <ds...@us...> - 2005-05-01 05:30:23
|
Update of /cvsroot/shadowirc/shadowirc/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32246/src/lib Modified Files: TCPStuff.c Log Message: Whitespace Fixes Index: TCPStuff.c =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/src/lib/TCPStuff.c,v retrieving revision 1.69 retrieving revision 1.70 diff -u -d -r1.69 -r1.70 --- TCPStuff.c 1 May 2005 05:18:31 -0000 1.69 +++ TCPStuff.c 1 May 2005 05:30:11 -0000 1.70 @@ -25,10 +25,6 @@ Note: This code was originally based on Peter N. Lewis's MacTCP source code. */ -#pragma mark - -#pragma mark ¥¥¥ÊTCPStuff -#pragma mark - - #define TCPCONTROL #define __TCPSTUFF__ #define __TCPCONNECTIONS__ @@ -80,7 +76,7 @@ [...1037 lines suppressed...] - * XXX Do what here? - */ - break; + default: + /* + * XXX Do what here? + */ + break; } break; } @@ -1194,7 +1209,7 @@ cer->event = C_NoEvent; oci = connectionItem; - + select(fd_max + 1, &rset, &wset, NULL, &ts); do { if(connections[connectionItem].magic == TCPCMagic) |
From: John B. <ds...@us...> - 2005-05-01 05:18:39
|
Update of /cvsroot/shadowirc/shadowirc/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26346/src/lib Modified Files: TCPStuff.c Log Message: Compiler Warnings: signedness mismatch Index: TCPStuff.c =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/src/lib/TCPStuff.c,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- TCPStuff.c 1 May 2005 04:47:39 -0000 1.68 +++ TCPStuff.c 1 May 2005 05:18:31 -0000 1.69 @@ -339,7 +339,7 @@ return (n); } -static int nblk_accept(int sockfd, struct sockaddr *addr, int *addrlen) +static int nblk_accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen) { int retval; set_nblk(sockfd); @@ -523,7 +523,7 @@ int TCPLocalPort(int sockfd) { struct sockaddr_storage sas; - int len; + socklen_t len; len = sizeof(sas); if(getsockname(sockfd, (SA *) &sas, &len) < 0) @@ -545,7 +545,7 @@ int TCPLocalIP(int sockfd, struct sockaddr *sa) { struct sockaddr_storage sas; - int len; + socklen_t len; len = sizeof(sas); if(getsockname(sockfd, (SA *) &sas, &len) < 0) @@ -558,7 +558,7 @@ int TCPRemoteIP(int sockfd, struct sockaddr *sa) { struct sockaddr_storage sas; - int len; + socklen_t len; len = sizeof(sas); if(getpeername(sockfd, (SA *) &sas, &len) < 0) @@ -1084,7 +1084,8 @@ */ if(FD_ISSET(c->sockfd, rset) || FD_ISSET(c->sockfd, wset)) { struct sockaddr_storage clientaddr; - int len, newfd; + socklen_t len; + int newfd; len = sizeof(clientaddr); newfd = nblk_accept(c->sockfd, (SA *) &clientaddr, &len); |
From: John B. <ds...@us...> - 2005-05-01 05:11:06
|
Update of /cvsroot/shadowirc/shadowirc/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22636/src Modified Files: InputLine.c Log Message: Compiler Warning: ChangeWindowAttributes()'s second param isn't a pointer; don't pass NULL Index: InputLine.c =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/src/InputLine.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- InputLine.c 26 Jan 2005 03:27:08 -0000 1.40 +++ InputLine.c 1 May 2005 05:10:56 -0000 1.41 @@ -1090,7 +1090,7 @@ if(inputLine.w) { // Get rid of the close box - ChangeWindowAttributes(inputLine.w, NULL, kWindowCloseBoxAttribute); + ChangeWindowAttributes(inputLine.w, 0, kWindowCloseBoxAttribute); GetPort(&p0); SetPortWindowPort(inputLine.w); |
From: John B. <ds...@us...> - 2005-05-01 05:03:01
|
Update of /cvsroot/shadowirc/shadowirc/pluginsAPI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18159/pluginsAPI Modified Files: ShadowIRC.h Log Message: Compile Warnings: fix some signedness warnings Index: ShadowIRC.h =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/pluginsAPI/ShadowIRC.h,v retrieving revision 1.74 retrieving revision 1.75 diff -u -d -r1.74 -r1.75 --- ShadowIRC.h 1 May 2005 04:43:07 -0000 1.74 +++ ShadowIRC.h 1 May 2005 05:02:51 -0000 1.75 @@ -1,5 +1,5 @@ /* ShadowIRC Plugins Header File - Version 2.0a14-preliminary + Version 2.0a15-preliminary © John Bafford 1997-2005. All Rights Reserved. ds...@sh... http://www.shadowirc.com @@ -26,7 +26,7 @@ #ifndef __ShadowIRC_Headers__ #define __ShadowIRC_Headers__ -#define _ShadowIRC_API_Version_ 0x0200000E +#define _ShadowIRC_API_Version_ 0x0200000F #include <Carbon/Carbon.h> #include <netinet/in.h> @@ -237,7 +237,7 @@ }; typedef struct LongString { - short len; //Length of a longstring. Functions as a C-string strlen() or a pascal string length byte would. + UInt16 len; //Length of a longstring. Functions as a C-string strlen() or a pascal string length byte would. unsigned char data[maxLSlen + 1]; //The string. data[1] is the _first_ character of the string. data[0] has no specific value. } LongString; @@ -2251,7 +2251,7 @@ Output: ls - The text to set the inputfield to. */ -void IADSetCursorSelection(inputAreaDataPtr iad, long start, long finish); +void IADSetCursorSelection(inputAreaDataPtr iad, UInt32 start, UInt32 finish); /* Sets the position of the selection on the input line. Input: iad - The IAD reference of the input field start - The start of the selection. @@ -2259,7 +2259,7 @@ Output: none */ -void IADGetCursorSelection(inputAreaDataPtr iad, long *start, long *finish); +void IADGetCursorSelection(inputAreaDataPtr iad, UInt32 *start, UInt32 *finish); /* Gets the selection in the inputline. Input: iad - The IAD reference of the input field Output: start - The start of the selection. |
From: John B. <ds...@us...> - 2005-05-01 05:03:01
|
Update of /cvsroot/shadowirc/shadowirc/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18159/src/lib Modified Files: LongStrings.h Log Message: Compile Warnings: fix some signedness warnings Index: LongStrings.h =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/src/lib/LongStrings.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- LongStrings.h 22 Feb 2004 07:29:20 -0000 1.6 +++ LongStrings.h 1 May 2005 05:02:51 -0000 1.7 @@ -1,6 +1,6 @@ /* ShadowIRC - A Mac OS IRC Client - Copyright (C) 1996-2004 John Bafford + Copyright (C) 1996-2005 John Bafford ds...@sh... http://www.shadowirc.com @@ -26,7 +26,7 @@ typedef struct LongString { - short len; + UInt16 len; //MISALIGNED 2 unsigned char data[maxLSlen + 1]; } LongString; |
From: John B. <ds...@us...> - 2005-05-01 05:03:01
|
Update of /cvsroot/shadowirc/shadowirc/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18159/src Modified Files: IRCInput.c InputControl.c InputControl.h Shortcuts.c Log Message: Compile Warnings: fix some signedness warnings Index: IRCInput.c =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/src/IRCInput.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- IRCInput.c 15 Aug 2004 02:46:29 -0000 1.38 +++ IRCInput.c 1 May 2005 05:02:51 -0000 1.39 @@ -379,7 +379,7 @@ } -static void _HNCFindWord(long cStart, long *wStart, long *wEnd, Ptr text, long textLen) +static void _HNCFindWord(UInt32 cStart, UInt32 *wStart, UInt32 *wEnd, Ptr text, UInt32 textLen) { int curPos = cStart; @@ -422,8 +422,8 @@ //WARNING: This doesn't work when you ctrl-w starting from whitespace static void BackwordDel(inputAreaDataPtr iad) { - long selStart, selEnd; - long wordStart, wordEnd; + UInt32 selStart, selEnd; + UInt32 wordStart, wordEnd; LongString ls; IADGetText(iad, &ls); @@ -444,9 +444,9 @@ if(!CurrentTarget.inactive && CurrentTarget.type == targChannel) { LongString ls; - long cStart, cEnd; - long wStart, wEnd; - long sel; + UInt32 cStart, cEnd; + UInt32 wStart, wEnd; + UInt32 sel; IADGetText(iad, &ls); IADGetCursorSelection(iad, &cStart, &cEnd); Index: InputControl.c =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/src/InputControl.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- InputControl.c 3 Sep 2004 18:29:15 -0000 1.5 +++ InputControl.c 1 May 2005 05:02:51 -0000 1.6 @@ -1,6 +1,6 @@ /* ShadowIRC - A Mac OS IRC Client - Copyright (C) 1996-2004 John Bafford + Copyright (C) 1996-2005 John Bafford ds...@sh... http://www.shadowirc.com @@ -62,22 +62,22 @@ #pragma mark Text Actions -void IADSetCursorSelection(inputAreaDataPtr iad, long start, long finish) +void IADSetCursorSelection(inputAreaDataPtr iad, UInt32 start, UInt32 finish) { TXNSetSelection(iad->il, start, finish); } -void IADGetCursorSelection(inputAreaDataPtr iad, long *start, long *finish) +void IADGetCursorSelection(inputAreaDataPtr iad, UInt32 *start, UInt32 *finish) { TXNGetSelection(iad->il, start, finish); } -void IADSetTextPtrRange(inputAreaDataPtr iad, Ptr text, long length, int start, int end) +void IADSetTextPtrRange(inputAreaDataPtr iad, Ptr text, UInt32 length, UInt32 start, UInt32 end) { TXNSetData(iad->il, kTXNTextData, text, length, start, end); } -void IADSetTextPtr(inputAreaDataPtr iad, Ptr text, long length) +void IADSetTextPtr(inputAreaDataPtr iad, Ptr text, UInt32 length) { TXNSetData(iad->il, kTXNTextData, text, length, kTXNStartOffset, kTXNEndOffset); } @@ -92,7 +92,7 @@ IADSetTextPtr(iad, &ls->data[1], ls->len); } -long IADGetTextHandleRange(inputAreaDataPtr iad, Handle *text, int start, int end) +long IADGetTextHandleRange(inputAreaDataPtr iad, Handle *text, UInt32 start, UInt32 end) { TXNGetDataEncoded(iad->il, start, end, text, kTXNTextData); Index: InputControl.h =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/src/InputControl.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- InputControl.h 3 Sep 2004 18:29:15 -0000 1.4 +++ InputControl.h 1 May 2005 05:02:51 -0000 1.5 @@ -1,6 +1,6 @@ /* ShadowIRC - A Mac OS IRC Client - Copyright (C) 1996-2004 John Bafford + Copyright (C) 1996-2005 John Bafford ds...@sh... http://www.shadowirc.com @@ -31,12 +31,12 @@ void IADSetFieldBounds(inputAreaDataPtr iad, Rect *r); #pragma mark Text Actions -void IADSetCursorSelection(inputAreaDataPtr iad, long start, long finish); -void IADGetCursorSelection(inputAreaDataPtr iad, long *start, long *finish); -void IADSetTextPtrRange(inputAreaDataPtr iad, Ptr text, long length, int start, int end); -void IADSetTextPtr(inputAreaDataPtr iad, Ptr text, long length); +void IADSetCursorSelection(inputAreaDataPtr iad, UInt32 start, UInt32 finish); +void IADGetCursorSelection(inputAreaDataPtr iad, UInt32 *start, UInt32 *finish); +void IADSetTextPtrRange(inputAreaDataPtr iad, Ptr text, UInt32 length, UInt32 start, UInt32 end); +void IADSetTextPtr(inputAreaDataPtr iad, Ptr text, UInt32 length); void IADSetText(inputAreaDataPtr iad, LongString *ls); -long IADGetTextHandleRange(inputAreaDataPtr iad, Handle *text, int start, int end); +long IADGetTextHandleRange(inputAreaDataPtr iad, Handle *text, UInt32 start, UInt32 end); long IADGetTextHandle(inputAreaDataPtr iad, Handle *text); long IADGetText(inputAreaDataPtr iad, LongString *ls); OSStatus IADHandleTextEvent(inputAreaDataPtr iad, EventRef event); Index: Shortcuts.c =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/src/Shortcuts.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- Shortcuts.c 16 Aug 2004 17:33:36 -0000 1.19 +++ Shortcuts.c 1 May 2005 05:02:51 -0000 1.20 @@ -416,7 +416,7 @@ int x; short cp, ep; Handle h; - long l1,l2; + UInt32 l1,l2; inputAreaDataPtr iad = ILGetInputDataFromMW(0); if(!iad) |
From: John B. <ds...@us...> - 2005-05-01 04:48:28
|
Update of /cvsroot/shadowirc/shadowirc/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10908/lib Modified Files: LongStrings.c MyMacBinary.c TCPStuff.c Log Message: Fix mismatched inclue case errors Index: LongStrings.c =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/src/lib/LongStrings.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- LongStrings.c 22 Jun 2004 19:37:34 -0000 1.14 +++ LongStrings.c 1 May 2005 04:47:39 -0000 1.15 @@ -1,6 +1,6 @@ /* ShadowIRC - A Mac OS IRC Client - Copyright (C) 1996-2004 John Bafford + Copyright (C) 1996-2005 John Bafford ds...@sh... http://www.shadowirc.com @@ -22,7 +22,7 @@ #include <stdarg.h> #include "LongStrings.h" -#include "inline.h" +#include "Inline.h" #define USE_SHADOWIRC_ASSEMBLY 0 Index: MyMacBinary.c =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/src/lib/MyMacBinary.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- MyMacBinary.c 30 Apr 2002 02:41:15 -0000 1.5 +++ MyMacBinary.c 1 May 2005 04:47:39 -0000 1.6 @@ -1,6 +1,6 @@ /* ShadowIRC - A Mac OS IRC Client - Copyright (C) 1996-2002 John Bafford + Copyright (C) 1996-2005 John Bafford ds...@sh... http://www.shadowirc.com @@ -27,7 +27,7 @@ #include "CalcCRC.h" #include "utils.h" -#include "inline.h" +#include "Inline.h" enum { macbin_folder_ftype = 'fold', Index: TCPStuff.c =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/src/lib/TCPStuff.c,v retrieving revision 1.67 retrieving revision 1.68 diff -u -d -r1.67 -r1.68 --- TCPStuff.c 20 Dec 2003 03:41:22 -0000 1.67 +++ TCPStuff.c 1 May 2005 04:47:39 -0000 1.68 @@ -1,11 +1,11 @@ /* ShadowIRC - A Mac OS IRC Client - Copyright (C) 1996-2000 John Bafford <ds...@sh...> + Copyright (C) 1996-2005 John Bafford <ds...@sh...> Re-written for MacOS X by: Landon Fuller <la...@fu...> Chris Campbell <chr...@ma...> Sean McGovern <smc...@us...> - Copyright (C) 2002-2003 Landon Fuller, Chris Campbell, John Bafford, Sean McGovern + Copyright (C) 2002-2005 Landon Fuller, Chris Campbell, John Bafford, Sean McGovern http://www.shadowirc.com This program is free software; you can redistribute it and/or @@ -49,7 +49,7 @@ #include "TCPStuff.h" #include "TCP.h" -#include "inline.h" +#include "Inline.h" #ifndef _utils_ #include "utils.h" |
From: John B. <ds...@us...> - 2005-05-01 04:43:29
|
Update of /cvsroot/shadowirc/shadowirc/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8725/src Modified Files: DCC.c DCC.h Log Message: Tiger compile fix - fix enum dccFlags items to not conflict with unix 'open' symbol. [mhaque] Index: DCC.c =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/src/DCC.c,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- DCC.c 25 Jan 2005 13:07:05 -0000 1.50 +++ DCC.c 1 May 2005 04:43:07 -0000 1.51 @@ -561,7 +561,7 @@ static void StartDCCGet(connectionPtr x) { - if(x->dcc->dccFlags == opening || x->dcc->dccFlags == open) //already open!! + if(x->dcc->dccFlags == dccOpening || x->dcc->dccFlags == dccOpen) //already open!! return; if(mainPrefs->autoSaveDCC) //go ahead @@ -596,7 +596,7 @@ dd = (dccSENDDataPtr)d->dccData; if(sendRev) { - d->dccFlags = waitingRev; + d->dccFlags = dccWaitingRev; d->reverse = true; } @@ -746,7 +746,7 @@ if(DCCCreate(link, dccCHAT, name, &x)) //if true, then created... { } - if(x->dcc->dccFlags == closed || x->dcc->dccFlags == waiting || x->dcc->dccFlags == offered) + if(x->dcc->dccFlags == dccClosed || x->dcc->dccFlags == dccWaiting || x->dcc->dccFlags == dccOffered) DCCOpen(&x); } else @@ -806,9 +806,9 @@ pDCCOpenedData p; ConstStringPtr sp; - if(d->dccFlags==waitingRev) + if(d->dccFlags == dccWaitingRev) { - d->dccFlags=offered; + d->dccFlags = dccOffered; //Make a fake d->refcon = (void*)++dccSENDRevCount; @@ -839,9 +839,9 @@ SendCommand(cc->link, &ls); LSParamString(&ls, GetIntStringPtr(spDCC, sRequestingRevDCC), sp, d->dccUserName, 0, 0); SMPrefixLinkColor(cc->link, &ls, dsFrontWin, sicCTCP); - d->dccFlags=waiting; + d->dccFlags = dccWaiting; } - else if(d->dccFlags == closed) + else if(d->dccFlags == dccClosed) { if(ConnNewListen(cc, AF_UNSPEC, 10)) { @@ -908,13 +908,13 @@ SendCommand(cc->link, &ls); LSParamString(&ls, GetIntStringPtr(spDCC, sRequestingDCC), sp, d->dccUserName, 0, 0); SMPrefixLinkColor(cc->link, &ls, dsFrontWin, sicCTCP); - d->dccFlags=waiting; + d->dccFlags = dccWaiting; opened=1; } else DCCFailed(x, GetIntStringPtr(spDCC, sFailedToCreate)); } - else if(d->dccFlags==offered) + else if(d->dccFlags == dccOffered) { char hbuf[NI_MAXHOST]; @@ -929,7 +929,7 @@ if(1) { - d->dccFlags=opening; + d->dccFlags = dccOpening; LSParamString(&ls, GetIntStringPtr(spDCC, sOpeningDCC), d->dccUserName, des, args, 0); SMPrefixLinkColor(cc->link, &ls, dsFrontWin, sicCTCP); opened=1; @@ -1244,7 +1244,7 @@ conn = *cn; d=conn->dcc; - d->dccFlags=open; + d->dccFlags = dccOpen; switch(d->dccType) { case dccCHAT: @@ -1736,7 +1736,7 @@ // SMPrefixLinkColor(link, &ls, dsFrontWin, sicCTCP); //but only if the chat's not going already... - if(x->dcc->dccFlags == open) + if(x->dcc->dccFlags == dccOpen) return; DCCClose(&x, true); @@ -1759,7 +1759,7 @@ BlockZero(x->sas, sizeof(struct sockaddr_storage)); x->port = 0; d->refcon = (void*)revNum; - d->dccFlags = closed; + d->dccFlags = dccClosed; d->reverse = true; } else @@ -1786,7 +1786,7 @@ NextArg(s, c); //port StringToNum(c, &l); x->port=l; - d->dccFlags=offered; + d->dccFlags = dccOffered; } @@ -1851,7 +1851,7 @@ BlockZero(x->sas, sizeof(struct sockaddr_storage)); x->port = 0; d->refcon = (void*)revNum; - d->dccFlags = closed; + d->dccFlags = dccClosed; d->reverse = true; } else @@ -1878,7 +1878,7 @@ NextArg(s, c); //port StringToNum(c, &l); x->port=l; - d->dccFlags=offered; + d->dccFlags = dccOffered; } dd = (dccGETDataPtr)d->dccData; @@ -2043,7 +2043,7 @@ StringToNum(c, &l); x->port=l; - x->dcc->dccFlags = offered; + x->dcc->dccFlags = dccOffered; DCCOpen(&x); } else @@ -2185,15 +2185,15 @@ { switch(d) { - case closed: + case dccClosed: return "\pCLOSED"; - case waiting: + case dccWaiting: return "\pWAITING"; - case offered: + case dccOffered: return "\pOFFERED"; - case opening: + case dccOpening: return "\pOPENING"; - case open: + case dccOpen: return "\pOPEN"; default: return "\pUNKNOWN"; Index: DCC.h =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/src/DCC.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- DCC.h 24 Apr 2003 16:22:15 -0000 1.7 +++ DCC.h 1 May 2005 04:43:07 -0000 1.8 @@ -64,7 +64,7 @@ }; enum dccTypes {dccNIL, dccCHAT, dccGET, dccSEND, dccRESUME, dccREVERSE, dccNIL2, dcccLIST, dcccCLOSE, dcccMAXIMUM}; -enum dccFlags {closed, waiting, offered, opening, open, waitingRev}; +enum dccFlags {dccClosed, dccWaiting, dccOffered, dccOpening, dccOpen, dccWaitingRev}; enum dccSendStage {sendNIL, sendHeader, sendDF, sendRF, sendDone}; typedef struct dccTypeRec { |
From: John B. <ds...@us...> - 2005-05-01 04:43:29
|
Update of /cvsroot/shadowirc/shadowirc/pluginsAPI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8725/pluginsAPI Modified Files: ShadowIRC.h Log Message: Tiger compile fix - fix enum dccFlags items to not conflict with unix 'open' symbol. [mhaque] Index: ShadowIRC.h =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/pluginsAPI/ShadowIRC.h,v retrieving revision 1.73 retrieving revision 1.74 diff -u -d -r1.73 -r1.74 --- ShadowIRC.h 7 Feb 2005 05:45:51 -0000 1.73 +++ ShadowIRC.h 1 May 2005 04:43:07 -0000 1.74 @@ -360,7 +360,7 @@ }; enum dccTypes {dccNIL, dccCHAT, dccGET, dccSEND, dccRESUME, dccREVERSE}; -enum dccFlags {closed, waiting, offered, opening, open, waitingRev}; +enum dccFlags {dccClosed, dccWaiting, dccOffered, dccOpening, dccOpen, dccWaitingRev}; enum dccSendStage {sendNIL, sendHeader, sendDF, sendRF, sendDone}; typedef struct dccCHATData { |
From: John B. <ds...@us...> - 2005-05-01 04:41:11
|
Update of /cvsroot/shadowirc/shadowirc/src/waste/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7821/src/waste/src Modified Files: WEInlineInput.c Log Message: Tiger compile fix - constants changed in Tiger with no good BC workaround. If someone wants this to compile pre-Tiger, make a patch containing conditional definitions of the constants and I'll include it. rdar://3734741 Index: WEInlineInput.c =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/src/waste/src/WEInlineInput.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- WEInlineInput.c 14 Dec 2002 15:49:15 -0000 1.4 +++ WEInlineInput.c 1 May 2005 04:41:03 -0000 1.5 @@ -59,14 +59,14 @@ hiliteStyle = ABS(hiliteStyle); // if hiliteStyle is kCaretPosition, set the selection range - if (hiliteStyle == kCaretPosition) + if (hiliteStyle == kTSMHiliteCaretPosition) { pWE->selStart = rangeStart; pWE->selEnd = rangeEnd; } else { - hiliteStyle -= kRawText; + hiliteStyle -= kTSMHiliteRawText; // otherwise set the WETextStyle flags of the specified range appropriately if ((hiliteStyle >= 0) && (hiliteStyle <= 3)) { |
From: John B. <ds...@us...> - 2005-05-01 04:36:21
|
Update of /cvsroot/shadowirc/shadowirc/src/plugins/userlist In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5203/src/plugins/userlist Modified Files: Info-Userlist.plist ULList.c userlist.c Log Message: Fix signedness comparison warnings, rev to and require 2.0a15 Index: Info-Userlist.plist =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/src/plugins/userlist/Info-Userlist.plist,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Info-Userlist.plist 13 Aug 2004 23:22:04 -0000 1.2 +++ Info-Userlist.plist 1 May 2005 04:35:55 -0000 1.3 @@ -19,6 +19,6 @@ <key>CFBundleSignature</key> <string>SIRC</string> <key>CFBundleVersion</key> - <string>2.0a12</string> + <string>2.0a15</string> </dict> </plist> Index: ULList.c =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/src/plugins/userlist/ULList.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- ULList.c 2 Nov 2002 04:39:24 -0000 1.12 +++ ULList.c 1 May 2005 04:35:55 -0000 1.13 @@ -1,6 +1,6 @@ /* ShadowIRC Userlist - Copyright (C) 1997-2002 John Bafford + Copyright (C) 1997-2005 John Bafford ds...@sh... http://www.shadowirc.com @@ -152,7 +152,7 @@ Str255 s; Str255 s2; channelPtr ch; - long num; + UInt32 num; if(!ul || ul->ulType != ulGlobal) return; @@ -185,4 +185,4 @@ GetWTitle(ul->uwin, s2); if(!pstrcmp(s, s2)) SetWTitle(ul->uwin, s); -} \ No newline at end of file +} Index: userlist.c =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/src/plugins/userlist/userlist.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- userlist.c 13 Aug 2004 23:22:04 -0000 1.34 +++ userlist.c 1 May 2005 04:35:55 -0000 1.35 @@ -1,6 +1,6 @@ /* ShadowIRC Userlist - Copyright (C) 1997-2004 John Bafford + Copyright (C) 1997-2005 John Bafford ds...@sh... http://www.shadowirc.com @@ -110,7 +110,7 @@ static ULI ULGetWindowProperty(WindowPtr w) { ULI ul; - long actualSize; + UInt32 actualSize; GetWindowProperty(w, kUserlistSignature, kUserlistWindow, sizeof(ul), &actualSize, &ul); @@ -603,7 +603,6 @@ } } */ - #pragma mark - @@ -840,7 +839,7 @@ static void DBItemNotify(ControlRef browser, DataBrowserItemID item, DataBrowserItemNotification message) { ULI ul; - long actualSize; + UInt32 actualSize; UserListPtr u = (UserListPtr)item; switch(message) @@ -1268,7 +1267,7 @@ LineTo(r.right, r.top); } -/* ¥¥¥ */ +// ¥¥¥ if(ul->rightSide) { r.left += kInWindowBorder; @@ -1287,7 +1286,6 @@ LineTo(r.left, r.top); LineTo(r.right, r.top); ValidWindowRect(ul->uwin, &r); -/* ¥¥¥ */ } } @@ -1804,7 +1802,7 @@ shadowircColors = sidrIN->shadowircColors; l=((pVersionCheckDataPtr)sidrIN->messageData)->version; - if(l<0x0200000C) //2.0a12 + if(l<0x0200000F) //2.0a15 { ((pVersionCheckDataPtr)sidrIN->messageData)->version = pVersionShadowIRCTooOld; displayOldVersionMsg(); |
From: John B. <ds...@us...> - 2005-05-01 04:36:21
|
Update of /cvsroot/shadowirc/shadowirc/src/plugins/hilight In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5203/src/plugins/hilight Modified Files: Highlight.c Info-Highlight.plist Log Message: Fix signedness comparison warnings, rev to and require 2.0a15 Index: Highlight.c =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/src/plugins/hilight/Highlight.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- Highlight.c 23 Jun 2004 05:47:15 -0000 1.11 +++ Highlight.c 1 May 2005 04:35:55 -0000 1.12 @@ -1,6 +1,6 @@ /* ShadowIRC - A Mac OS IRC Client - Copyright (C) 1996-2002 John Bafford + Copyright (C) 1996-2005 John Bafford ds...@sh... http://www.shadowirc.com @@ -26,7 +26,7 @@ typedef struct WordPref { Str63 word; //Size should to match length of nick - char matchStrict; + Boolean matchStrict; char unused[3]; } WordPref, *WordPrefPtr, **WordPrefHand; @@ -83,8 +83,8 @@ static WordPrefs wordPrefs; static struct { - char boldToken, boldNick; - char autoHilightCurNick; + Boolean boldToken, boldNick; + Boolean autoHilightCurNick; } prefs = { 1, 1, 1 @@ -708,7 +708,7 @@ case pVersionCheckMessage: sidr=sidrIN; l=((pVersionCheckDataPtr)sidrIN->messageData)->version; - if(l<0x02000008) //we must have ShadowIRC 2.0d8 or later. + if(l<0x0200000F) //we must have ShadowIRC 2.0a15 or later. { ((pVersionCheckDataPtr)sidrIN->messageData)->version = pVersionShadowIRCTooOld; displayOldVersionMsg(); Index: Info-Highlight.plist =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/src/plugins/hilight/Info-Highlight.plist,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Info-Highlight.plist 23 Jun 2004 08:17:20 -0000 1.1 +++ Info-Highlight.plist 1 May 2005 04:35:55 -0000 1.2 @@ -19,6 +19,6 @@ <key>CFBundleSignature</key> <string>SIRC</string> <key>CFBundleVersion</key> - <string>2.0a11</string> + <string>2.0a15</string> </dict> </plist> |
From: Sean M. <smc...@us...> - 2005-03-18 07:45:34
|
Update of /cvsroot/shadowirc/shadowirc/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4471 Modified Files: IRCSFeatures.c Log Message: Avoid 'might be used uninitialized' warning. Pointer variables should always be initialized to NULL if they have no immediate value. Index: IRCSFeatures.c =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/src/IRCSFeatures.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- IRCSFeatures.c 30 Jan 2005 04:18:24 -0000 1.2 +++ IRCSFeatures.c 18 Mar 2005 07:45:12 -0000 1.3 @@ -169,7 +169,7 @@ if(kf) { - void* data; + void* data = NULL; void* srcLoc = kf->def; if(kf->type == featureBool) |
From: John B. <ds...@us...> - 2005-02-07 05:46:04
|
Update of /cvsroot/shadowirc/shadowirc/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23736/src Modified Files: ServerCommands.c plugins.h Log Message: Correctly route notices to @#channel target Index: ServerCommands.c =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/src/ServerCommands.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- ServerCommands.c 26 Jan 2005 03:27:30 -0000 1.22 +++ ServerCommands.c 7 Feb 2005 05:45:51 -0000 1.23 @@ -87,7 +87,7 @@ Str255 dispFrom; pServerNOTICEDataRec p; MWPtr mw; - char ign=IsIgnoredNickUser(from, fromuser); + char ign = IsIgnoredNickUser(from, fromuser); if(!doCTCP(from, fromuser, target, ls, true, ign, link)) { @@ -112,9 +112,20 @@ p.dontSound = false; p.displayUserHost = mainPrefs->showUserHostsWithMsgs && !p.fromServer; p.redirect = 0; + p.wallchops = 0; - if((p.targChan = ((p.chan=ChFind(target, link))!=0)) == 0) + if(target[1] == '@') { + p.wallchops = 1; + pdelete(target, 1, 1); + } + + p.chan = ChFind(target, link); + p.targChan = p.chan != 0; + + if(!p.targChan) + { + p.wallchops = 0; if((p.targMe = pstrcasecmp(target, link->CurrentNick)) == 0) p.targOther=1; } Index: plugins.h =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/src/plugins.h,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- plugins.h 15 Aug 2004 07:18:03 -0000 1.31 +++ plugins.h 7 Feb 2005 05:45:51 -0000 1.32 @@ -532,8 +532,8 @@ char displayUserHost; //If true, displays the person's userhost. defaults to targMe && mainPrefs->showUserHostsWithMsgs char toConsole; //Force to console char dontSound; //If true, don't play a sound. - -char unused[3]; + char wallchops; //If true, message was targed to @#channel +char unused[2]; MWPtr redirect; } pServerNOTICEDataRec, *pServerNOTICEDataPtr; |
From: John B. <ds...@us...> - 2005-02-07 05:46:04
|
Update of /cvsroot/shadowirc/shadowirc/pluginsAPI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23736/pluginsAPI Modified Files: ShadowIRC.h Log Message: Correctly route notices to @#channel target Index: ShadowIRC.h =================================================================== RCS file: /cvsroot/shadowirc/shadowirc/pluginsAPI/ShadowIRC.h,v retrieving revision 1.72 retrieving revision 1.73 diff -u -d -r1.72 -r1.73 --- ShadowIRC.h 26 Jan 2005 04:14:45 -0000 1.72 +++ ShadowIRC.h 7 Feb 2005 05:45:51 -0000 1.73 @@ -1217,8 +1217,9 @@ char displayUserHost; //If true, displays the person's userhost. defaults to targMe && mainPrefs->showUserHostsWithMsgs char toConsole; //Force to console char dontSound; //If true, don't play a sound. + char wallchops; //If true, message was targed to @#channel -char unused[3]; +char unused[2]; MWPtr redirect; //If not nil, redirect output to this message window. } pServerNOTICEDataRec, *pServerNOTICEDataPtr; |