318669 - [BEOS] bustage from fix to bug 241758

Status: RESOLVED FIXED

(Core Graveyard :: RDF, defect)

Description

[Doug Shelton]

User-Agent:       Mozilla/5.0 (BeOS; U; BeOS BePC; en-US; rv:1.9a1) Gecko/20051201 Firefox/1.6a1
Build Identifier: Mozilla/5.0 (BeOS; U; BeOS BePC; en-US; rv:1.9a1) Gecko/20051201 Firefox/1.6a1

nsFileSystemDataSource.cpp no longer builds under BeOS.

Reproducible: Always

Steps to Reproduce:
1.attempt to build Thunderbird
2.wait for error message
3.

Actual Results:  
build fails - error messages included as attachment.

Expected Results:  
build succeeds

Comment 1

[Doug Shelton]

Attachment: error message with failed build

Comment 2

[Doug Shelton]

this appears to be a result of changes committed in bug 241758 earlier today.

Comment 3

[Doug Shelton]

sorry about the confusing updates - I'm still getting the hang of bugzilla.  The problem is impacting the trunk, core RDF 1.9a1 

Comment 4

[Sergei Dolgov]

type for netPositiveDir was changed fron char* to nsCString and definition moved from *.cpp to *.h.

Changes to fix.
http://lxr.mozilla.org/seamonkey/source/rdf/datasource/src/nsFileSystemDataSource.cpp#1426
must look like:
if (strstr(uri, netPositiveDir.get()) != 0)

http://lxr.mozilla.org/seamonkey/source/rdf/datasource/src/nsFileSystemDataSource.cpp#1599
must look like:
if (!netPositiveDir.IsEmpty())

and
http://lxr.mozilla.org/seamonkey/source/rdf/datasource/src/nsFileSystemDataSource.cpp#1601
if (strstr(uri, netPositiveDir.get()) != 0)

Comment 5

[Doug Shelton]

fyysik, this almost fixed it.  Still one problem with line 1601:

/boot/home/develop/mozilla/rdf/datasource/src/nsFileSystemDataSource.cpp:1601: cannot convert `uri' from type `nsCString' to type `const char *'

Comment 6

[Sergei Dolgov]

ok, so 1601 must be:

if (strstr(uri.get(), netPositiveDir.get()) != 0)

as "uri" is defined in differently from first case.
actually, looks like it is better to use  some of nsCString own Compare() methods here instead strstr but that if some nsString guru gives advise on that.

Also, please add here:
http://lxr.mozilla.org/seamonkey/source/rdf/datasource/src/nsFileSystemDataSource.h#50

XP_BEOS 
case

Comment 7

[Doug Shelton]

looks like the last changed fixed it.  I'm doing a full build now.  If there are no other complications, I'll submit a patch.

Comment 8

[Doug Shelton]

(In reply to comment #6)
> Also, please add here:
> http://lxr.mozilla.org/seamonkey/source/rdf/datasource/src/nsFileSystemDataSource.h#50
> 
> XP_BEOS 
> case
> 
I saw that and thought it might be necessary. I'll change it.

Comment 9

[Doug Shelton]

Attachment: fixes BeOS bustage

Comment 10

[Doug Shelton]

Comment on attachment 204794 [details] [diff] [review]
fixes BeOS bustage

fyysik, patch incorporates changes to .cpp and .h.  Builds clean and runs OK.  Please review.  May also need SR?

Comment 11

[Sergei Dolgov]

Comment on attachment 204794 [details] [diff] [review]
fixes BeOS bustage

r=sergei_d

Comment 12

[tqh]

Ok, lazy question:
Are we sure netpositiveDir is never null for BeOS?

Comment 13

[Doug Shelton]

(In reply to comment #12)
> Ok, lazy question:
> Are we sure netpositiveDir is never null for BeOS?
> 
I'm not completely sure. Is netpositiveDir getting its non-null value around line 220 of nsFileSystemDataSource.cpp?

Also, assuming we're OK, who can commit?

Comment 14

[Christian :Biesinger (don't email me, ping me on IRC)]

nsCString::get will never return null

btw, it'd be good if you reassigned bugs to default owner/qa when changing components...

fixed on trunk

Checking in rdf/datasource/src/nsFileSystemDataSource.cpp;
/cvsroot/mozilla/rdf/datasource/src/nsFileSystemDataSource.cpp,v  <--  nsFileSystemDataSource.cpp
new revision: 1.142; previous revision: 1.141
done
Checking in rdf/datasource/src/nsFileSystemDataSource.h;
/cvsroot/mozilla/rdf/datasource/src/nsFileSystemDataSource.h,v  <--  nsFileSystemDataSource.h
new revision: 1.13; previous revision: 1.12
done

Comment 15

[Doug Shelton]

I also appreciate the comment about changing owners.  My ignorance of proper use of bugzilla resources explains my actions, but it's not an excuse.  I'm learning as I go.  thank you for your help, biesi!