448431 - PK11_CreateMergeLog() declaration causes gcc warning when compiling with -Wstrict-prototypes

Status: RESOLVED FIXED

(NSS :: Libraries, defect, P4)

Description

[Dave Allan]

User-Agent:       Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.16) Gecko/20080715 Fedora/2.0.0.16-1.fc8 Firefox/2.0.0.16
Build Identifier: CVS head

When compiling a program that includes using NSS under gcc4 (gcc (GCC) 4.1.2 20070925 (Red Hat 4.1.2-33)) with:

gcc -Wstrict-prototypes -I /usr/include/nss3 -I /usr/include/nspr4 -o test test.c

I get the following warning:

/usr/include/nss3/pk11pub.h:249: warning: function declaration isn’t a prototype

The attached patch clears up the warning.

Reproducible: Always

Steps to Reproduce:
1. Compile the attached trivial program with gcc4 (I didn't check other versions of gcc to see if they behave differently):

gcc -Wstrict-prototypes -I /usr/include/nss3 -I /usr/include/nspr4 -o test test.c
Actual Results:  
[user@host NSS]$ gcc -Wstrict-prototypes -I /usr/include/nss3 -I /usr/include/nspr4 -o test test.c
In file included from test.c:1:
/usr/include/nss3/pk11pub.h:249: warning: function declaration isn’t a prototype
[user@host NSS]$

Expected Results:  
No warning

Comment 1

[Dave Allan]

Attachment: trivial test program showing warning

Comment 2

[Dave Allan]

Attachment: add void to declaration and definition

Comment 3

[Wan-Teh Chang]

Comment on attachment 331645 [details] [diff] [review]
add void to declaration and definition

r=wtc.

Comment 4

[Wan-Teh Chang]

Thanks for the patch.  I checked it in on the NSS trunk (NSS 3.12.2).

Checking in pk11merge.c;
/cvsroot/mozilla/security/nss/lib/pk11wrap/pk11merge.c,v  <--  pk11merge.c
new revision: 1.2; previous revision: 1.1
done
Checking in pk11pub.h;
/cvsroot/mozilla/security/nss/lib/pk11wrap/pk11pub.h,v  <--  pk11pub.h
new revision: 1.27; previous revision: 1.26
done