1427023 - Remove nsCRT::strncmp

Status: RESOLVED FIXED

Description

[Masatoshi Kimura [:emk]]

Because nsCRT::strncmp behaves more like wmemcmp than wcsncmp and the current name is misleading.

Comment 1

[Eric Rahm [:erahm] (Away until June 3rd)]

(In reply to Masatoshi Kimura [:emk] from comment #0)
> Because nsCRT::strncmp behaves more like wmemcmp than wcsncmp and the
> current name is misleading.

I guess you mean the char16_t* version [1], perhaps we should fix it to handle null-terminators instead of renaming?

[1] https://searchfox.org/mozilla-central/rev/51cd1093c5c2113e7b041e8cc5c9bf2186abda13/xpcom/ds/nsCRT.h#105-106

Comment 2

[Masatoshi Kimura [:emk]]

Attachment: Remove nsCRT::strncmp

Comment 3

[Masatoshi Kimura [:emk]]

Comment on attachment 8941056 [details] [diff] [review]
Remove nsCRT::strncmp

I completely removed nsCRT::strncmp instead.

The char* version can be replaced with the plain strncmp.
The char16_t* version can be replaced with NS_strncmp. I confirmed that null check is not required or already done.

Comment 4

[Eric Rahm [:erahm] (Away until June 3rd)]

Comment on attachment 8941056 [details] [diff] [review]
Remove nsCRT::strncmp

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

r=me but please delete the rest of the dead code :) Also it looks like we can close bug 1427871 as a dup of this now.

::: netwerk/cache/nsMemoryCacheDevice.cpp
@@ +462,5 @@
>  {
>      const char * clientID = static_cast<ClientIDArgs*>(args)->clientID;
>      uint32_t prefixLength = static_cast<ClientIDArgs*>(args)->prefixLength;
>      const char * key = entry->Key()->get();
> +    return !clientID || strncmp(clientID, key, prefixLength) == 0;

Is it possible for `key` to be null here? It looks like `entry->Key()` is an `nsCString` so we should be good. We could probably change this to use `StringBeginsWith` but it's fine if you want to keep it as-is.

::: xpcom/ds/nsCRT.h
@@ -102,5 @@
>    /// Like strcmp except for ucs2 strings
>    static int32_t strcmp(const char16_t* aStr1, const char16_t* aStr2);
> -  /// Like strcmp except for ucs2 strings
> -  static int32_t strncmp(const char16_t* aStr1, const char16_t* aStr2,
> -                         uint32_t aMaxLen);

We can also delete the two `strncmp(const char*, const char*, ...)` implementations as well right?

Comment 5

[Masatoshi Kimura [:emk]]

Attachment: Remove nsCRT::strncmp

Comment 6

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/077e64a34f6b
Remove nsCRT::strncmp. r=erahm

Comment 7

[Eric Rahm [:erahm] (Away until June 3rd)]

Jorg, not sure if this affects comm-central but FYI.

Comment 8

[Jorg K (GMT+2)]

Thanks, I can't see nsCRT::strncmp in comm-central, but we'll notice it if it breaks ;-) The fix is straight forward anyway.

Comment 9

[Andrei Ciure[:andrei_ciure]]

https://hg.mozilla.org/mozilla-central/rev/077e64a34f6b