Mercurial > pidgin
changeset 5800:ac418a9dea99
[gaim-migrate @ 6225]
Some code cleanup from Ryan McCabe (odin). Thanks again Ryan!
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sat, 07 Jun 2003 18:46:49 +0000 |
| parents | cbff8a7bbde8 |
| children | 4ee33a2f421e |
| files | src/protocols/oscar/aim.h src/protocols/oscar/util.c |
| diffstat | 2 files changed, 1 insertions(+), 40 deletions(-) [+] |
line wrap: on
line diff
--- a/src/protocols/oscar/aim.h Sat Jun 07 15:52:38 2003 +0000 +++ b/src/protocols/oscar/aim.h Sat Jun 07 18:46:49 2003 +0000 @@ -596,7 +596,7 @@ #define AIM_CLIENTTYPE_WINAIM 0x0002 #define AIM_CLIENTTYPE_WINAIM41 0x0003 #define AIM_CLIENTTYPE_AOL_TOC 0x0004 -faim_export unsigned short aim_im_fingerprint(const fu8_t *msghdr, int len); +faim_export fu16_t aim_im_fingerprint(const fu8_t *msghdr, int len); #define AIM_RATE_CODE_CHANGE 0x0001 #define AIM_RATE_CODE_WARNING 0x0002 @@ -1416,9 +1416,6 @@ faim_export int aim_snlen(const char *sn); faim_export int aim_sncmp(const char *sn1, const char *sn2); -/* for libc's that dont have it */ -faim_export char *aim_strsep(char **pp, const char *delim); - #include <aim_internal.h> #endif /* __AIM_H__ */
--- a/src/protocols/oscar/util.c Sat Jun 07 15:52:38 2003 +0000 +++ b/src/protocols/oscar/util.c Sat Jun 07 18:46:49 2003 +0000 @@ -210,39 +210,3 @@ return 1; } - -/* strsep Copyright (C) 1992, 1993 Free Software Foundation, Inc. -strsep is part of the GNU C Library. - -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. - -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ - -/* Minor changes by and1000 on 15/1/97 to make it go under Nemesis */ - -faim_export char *aim_strsep(char **pp, const char *delim) -{ - char *p, *q; - - if (!(p = *pp)) - return 0; - - if ((q = strpbrk (p, delim))) { - *pp = q + 1; - *q = '\0'; - } else - *pp = 0; - - return p; -}