1404654 - use FOLDER_SUFFIX constant where possible

Status: RESOLVED FIXED

(MailNews Core :: Backend, enhancement)

Description

[:aceman]

Following bug 1404003 and bug 1402750, there are still some places in m-c code using hardcoded ".sbd" string instead of the FOLDER_SUFFIX constant. Those could be improved.

Comment 1

[:aceman]

Attachment: 1404654.patch

Try run: https://treeherder.mozilla.org/#/jobs?repo=try-comm-central&revision=63dd5b395b08ee9696b10793575dde240f080578

Comment 2

[Jorg K (CEST = GMT+2)]

Comment on attachment 8914047 [details] [diff] [review]
1404654.patch

Nice-ö ;-)

Have you considered creating defines for the length of those strings?
#define SUMMARY_SUFFIX_LENGTH 4
etc.

We'd fire anyone changing the string without adapting the length ;-)

That would avoid code like:
proposedDBName.SetLength(proposedDBName.Length() - NS_LITERAL_STRING(SUMMARY_SUFFIX).Length());

Comment 3

[:aceman]

(In reply to Jorg K (GMT+2) from comment #2)
> We'd fire anyone changing the string without adapting the length ;-)
> 
> That would avoid code like:
> proposedDBName.SetLength(proposedDBName.Length() -
> NS_LITERAL_STRING(SUMMARY_SUFFIX).Length());

Yes that happens also in the patch
name.SetLength(len - suffix.Length()); // truncate the string

I don't like it much, I can think about it.

Another place uses
moveValue.Cut(offset, strlen(FOLDER_SUFFIX8));
but has to already know where the suffix is in the string (offset), it may not be at the end.

Comment 4

[Jorg K (CEST = GMT+2)]

(In reply to :aceman from comment #3)
> I don't like it much, I can think about it.
It will get rid of all the ugly constructs we do to get a know value: 4:
NS_LITERAL_STRING(SUMMARY_SUFFIX).Length()
suffix.Length()
strlen(FOLDER_SUFFIX8), although the compiler might pre-evaluate this one.

Comment 5

[:aceman]

I mean I do not like the ugly ways of cutting the string.
Yes, using the constant could make them prettier.

Comment 6

[Jorg K (CEST = GMT+2)]

Comment on attachment 8914047 [details] [diff] [review]
1404654.patch

Too many requests, so cancelling this one since we're waiting for a new patch.

Comment 7

[:aceman]

Attachment: 1404654.patch v2

Comment 8

[Jorg K (CEST = GMT+2)]

Comment on attachment 8914857 [details] [diff] [review]
1404654.patch v2

Nice-ö! (Korean pronunciation)

Comment 9

[Jorg K (CEST = GMT+2)]

Comment on attachment 8914857 [details] [diff] [review]
1404654.patch v2

Hold on, where is the hunk to remove this??
proposedDBName.SetLength(proposedDBName.Length() - NS_LITERAL_STRING(SUMMARY_SUFFIX).Length());

Comment 10

[:aceman]

Attachment: 1404654.patch v2.1

Sorry, got overlooked ;)

Comment 11

[Jorg K (CEST = GMT+2)]

Comment on attachment 8914938 [details] [diff] [review]
1404654.patch v2.1

Thanks. Missed my last push by 5 minutes.

Comment 12

[Jorg K (CEST = GMT+2)]

Comment on attachment 8914938 [details] [diff] [review]
1404654.patch v2.1

Review of attachment 8914938 [details] [diff] [review]:
-----------------------------------------------------------------

::: mailnews/local/src/nsMsgLocalStoreUtils.cpp
@@ +56,5 @@
>        StringBeginsWith(name, NS_LITERAL_STRING("feeditems_error")))
>      return true;
>  
>    // The .mozmsgs dir is for spotlight support
>      return (StringEndsWith(name, NS_LITERAL_STRING(".mozmsgs")) ||

I think that should have a 'u' prepended, but then we have heaps of those, as does M-C, see bug 870698 comment #30, so I'll leave that for another bug.

Comment 13

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/d7d59e4c13d7
use FOLDER_SUFFIX and SUMMARY_SUFFIX constants where possible, use #define for length. r=jorgk