Package: libcunit1
Version: 2.1-0.dfsg-8
Severity: important
Tags: patch

---------------- test.c-----------
#include <CUnit/CUnit.h>
void test()
{
        CU_ASSERT( 1 > 1 );
}
----------------------------------

gcc -c test.c  => no warnings
g++ -c test.c  => warning about converting static string to char*

Basically there are 3 warnings per CU_ASSERT* used. With large number
of tests, one ends up with huge number of warnings. This can hide
other important warnings.

The patch is very simple.  Changing "char[]" definition to "const
char[]" does the trick.

- Adam


-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.26-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages libcunit1 depends on:
ii  libc6                         2.7-15     GNU C Library: Shared libraries

libcunit1 recommends no packages.

libcunit1 suggests no packages.

-- no debconf information
diff -ru cunit-2.1-0.dfsg.old/CUnit/Headers/TestRun.h cunit-2.1-0.dfsg/CUnit/Headers/TestRun.h
--- cunit-2.1-0.dfsg.old/CUnit/Headers/TestRun.h	2006-01-29 21:48:26.000000000 -0600
+++ cunit-2.1-0.dfsg/CUnit/Headers/TestRun.h	2008-10-17 23:03:14.665086520 -0500
@@ -172,9 +172,9 @@
 /* Assertion implementation function. */
 CU_EXPORT CU_BOOL CU_assertImplementation(CU_BOOL bValue,
                                           unsigned int uiLine,
-                                          char strCondition[],
-                                          char strFile[],
-                                          char strFunction[],
+                                          const char strCondition[],
+                                          const char strFile[],
+                                          const char strFunction[],
                                           CU_BOOL bFatal);
 
 #ifdef USE_DEPRECATED_CUNIT_NAMES
diff -ru cunit-2.1-0.dfsg.old/CUnit/Sources/Framework/TestRun.c cunit-2.1-0.dfsg/CUnit/Sources/Framework/TestRun.c
--- cunit-2.1-0.dfsg.old/CUnit/Sources/Framework/TestRun.c	2006-01-29 21:52:34.000000000 -0600
+++ cunit-2.1-0.dfsg/CUnit/Sources/Framework/TestRun.c	2008-10-17 23:05:43.191046200 -0500
@@ -87,8 +87,8 @@
 static void         add_failure(CU_pFailureRecord* ppFailure,
                                 CU_pRunSummary pRunSummary,
                                 unsigned int uiLineNumber,
-                                char szCondition[],
-                                char szFileName[],
+                                const char szCondition[],
+                                const char szFileName[],
                                 CU_pSuite pSuite,
                                 CU_pTest pTest);
 
@@ -119,9 +119,9 @@
  */
 CU_BOOL CU_assertImplementation(CU_BOOL bValue, 
                                 unsigned int uiLine,
-                                char strCondition[], 
-                                char strFile[],
-                                char strFunction[], 
+                                const char strCondition[], 
+                                const char strFile[],
+                                const char strFunction[], 
                                 CU_BOOL bFatal)
 {
   /* not used in current implementation - stop compiler warning */
@@ -587,8 +587,8 @@
 void add_failure(CU_pFailureRecord* ppFailure,
                  CU_pRunSummary pRunSummary,
                  unsigned int uiLineNumber,
-                 char szCondition[],
-                 char szFileName[],
+                 const char szCondition[],
+                 const char szFileName[],
                  CU_pSuite pSuite,
                  CU_pTest pTest)
 {

Reply via email to