Attachment #195172 for bug #273999

View | Details | Raw Unified | Return to bug 273999
Collapse All | Expand All

Lines 538-544 WvIPNet::WvIPNet(const WvIPNet &_net) Link Here

(-)wvstreams-4.5.orig/ipstreams/wvaddr.cc (-1 / +1 lines)
538	// If the netmask is not specified, it will default to all 1's.	538	// If the netmask is not specified, it will default to all 1's.
539	void WvIPNet::string_init(const char string[])	539	void WvIPNet::string_init(const char string[])
540	{	540	{
541	char *maskptr;	541	const char *maskptr;
542	int bits;	542	int bits;
543	uint32_t imask;	543	uint32_t imask;
544		544




 
    const char *iptr;
    char *optr;
    const char *idx1, *idx2;
    static const char hex[] = "0123456789ABCDEF";
    WvString in, intmp(str), out;


    if (!line || !a)
	return WvString::null;

    const char *loc = strstr(line, a);
    if (loc == 0)
	return "";


	return WvString::null;

    WvString ret = line;
    ret.unique();
    char *loc = strstr(ret.edit(), a);

    if (loc == 0)
	return line;

Lines 147-153 bool is_new_ver(unsigned int ver) Link Here

(-)wvstreams-4.5.orig/utils/verstring.cc (-1 / +1 lines)
147		147
148	bool is_new_verstr(const char *str)	148	bool is_new_verstr(const char *str)
149	{	149	{
150	char *p = strchr(str, '.');	150	const char *p = strchr(str, '.');
151	if (p && strchr(p+1, '.'))	151	if (p && strchr(p+1, '.'))
152	return true;	152	return true;
153		153

Return to bug 273999

Lines 315-321 WvString url_decode(WvStringParm str, bo Link Here

(-)wvstreams-4.5.orig/utils/strutils.cc (-4 / +4 lines)
315		315
316	const char *iptr;	316	const char *iptr;
317	char *optr;	317	char *optr;
318	char idx1, idx2;	318	const char idx1, idx2;
319	static const char hex[] = "0123456789ABCDEF";	319	static const char hex[] = "0123456789ABCDEF";
320	WvString in, intmp(str), out;	320	WvString in, intmp(str), out;
321		321
Lines 967-973 WvString afterstr(WvStringParm line, WvS Link Here
967	if (!line \|\| !a)	967	if (!line \|\| !a)
968	return WvString::null;	968	return WvString::null;
969		969
970	char *loc = strstr(line, a);	970	const char *loc = strstr(line, a);
971	if (loc == 0)	971	if (loc == 0)
972	return "";	972	return "";
973		973
Lines 984-991 WvString beforestr(WvStringParm line, Wv Link Here
984	return WvString::null;	984	return WvString::null;
985		985
986	WvString ret = line;	986	WvString ret = line;
987	ret.unique();	987	ret.unique();
988	char *loc = strstr(ret, a);	988	char *loc = strstr(ret.edit(), a);
989		989
990	if (loc == 0)	990	if (loc == 0)
991	return line;	991	return line;