[Valgrind-developers] Valgrind: r15776 - in /trunk: callgrind/ coregrind/ coregrind/m_aspacemgr/ coregrind/m_coredump/ coregrind/m_debuginfo/ coregrind/m_initimg/ coregrind/m_syswrap/ drd/ exp-sgcheck/ helgrind/ massif/ memcheck/

[<sv...@va...>]

Author: philippe
Date: Wed Jan 27 22:35:14 2016
New Revision: 15776

Log:
Fix misplaced closing parenthesis in various VG_(....) calls
At many places, we have:
   VG_(fun(a,b,c))
instead of
   VG_(fun)(a,b,c)
So, fix these cases, found using:
grep -n -i -e 'VG_([a-z][a-z0-9_]*[^a-z0-9_)]' *.c */*.c */*/*.c


Modified:
    trunk/callgrind/main.c
    trunk/coregrind/m_aspacemgr/aspacemgr-linux.c
    trunk/coregrind/m_coredump/coredump-elf.c
    trunk/coregrind/m_coredump/coredump-solaris.c
    trunk/coregrind/m_debuginfo/debuginfo.c
    trunk/coregrind/m_debuginfo/readmacho.c
    trunk/coregrind/m_initimg/initimg-linux.c
    trunk/coregrind/m_initimg/initimg-solaris.c
    trunk/coregrind/m_libcbase.c
    trunk/coregrind/m_main.c
    trunk/coregrind/m_signals.c
    trunk/coregrind/m_syswrap/syswrap-solaris.c
    trunk/coregrind/m_transtab.c
    trunk/drd/drd_clientreq.c
    trunk/drd/drd_load_store.c
    trunk/exp-sgcheck/pc_common.c
    trunk/helgrind/hg_main.c
    trunk/massif/ms_main.c
    trunk/memcheck/mc_errors.c
    trunk/memcheck/mc_main.c

Modified: trunk/callgrind/main.c
==============================================================================
--- trunk/callgrind/main.c (original)
+++ trunk/callgrind/main.c Wed Jan 27 22:35:14 2016
@@ -1576,7 +1576,7 @@
 static Bool handle_gdb_monitor_command (ThreadId tid, const HChar *req)
 {
    HChar* wcmd;
-   HChar s[VG_(strlen(req)) + 1]; /* copy for strtok_r */
+   HChar s[VG_(strlen)(req) + 1]; /* copy for strtok_r */
    HChar *ssaveptr;
 
    VG_(strcpy) (s, req);
@@ -2024,7 +2024,7 @@
 
    CLG_(instrument_state) = CLG_(clo).instrument_atstart;
 
-   if (VG_(clo_verbosity > 0)) {
+   if (VG_(clo_verbosity) > 0) {
       VG_(message)(Vg_UserMsg,
                    "For interactive control, run 'callgrind_control%s%s -h'.\n",
                    (VG_(arg_vgdb_prefix) ? " " : ""),

Modified: trunk/coregrind/m_aspacemgr/aspacemgr-linux.c
==============================================================================
--- trunk/coregrind/m_aspacemgr/aspacemgr-linux.c (original)
+++ trunk/coregrind/m_aspacemgr/aspacemgr-linux.c Wed Jan 27 22:35:14 2016
@@ -335,7 +335,7 @@
 
 #define AM_SANITY_CHECK                                      \
    do {                                                      \
-      if (VG_(clo_sanity_level >= 3))                        \
+      if (VG_(clo_sanity_level) >= 3)                        \
          aspacem_assert(VG_(am_do_sync_check)                \
             (__PRETTY_FUNCTION__,__FILE__,__LINE__));        \
    } while (0) 

Modified: trunk/coregrind/m_coredump/coredump-elf.c
==============================================================================
--- trunk/coregrind/m_coredump/coredump-elf.c (original)
+++ trunk/coregrind/m_coredump/coredump-elf.c Wed Jan 27 22:35:14 2016
@@ -640,7 +640,7 @@
    /* First, count how many memory segments to dump */
    num_phdrs = 1;		/* start with notes */
    for(i = 0; i < n_seg_starts; i++) {
-      if (!may_dump(VG_(am_find_nsegment(seg_starts[i]))))
+      if (!may_dump(VG_(am_find_nsegment)(seg_starts[i])))
 	 continue;
 
       num_phdrs++;
@@ -698,7 +698,7 @@
    off = VG_PGROUNDUP(off);
 
    for(i = 0, idx = 1; i < n_seg_starts; i++) {
-      seg = VG_(am_find_nsegment(seg_starts[i]));
+      seg = VG_(am_find_nsegment)(seg_starts[i]);
 
       if (!may_dump(seg))
 	 continue;
@@ -721,7 +721,7 @@
    VG_(lseek)(core_fd, phdrs[1].p_offset, VKI_SEEK_SET);
 
    for(i = 0, idx = 1; i < n_seg_starts; i++) {
-      seg = VG_(am_find_nsegment(seg_starts[i]));
+      seg = VG_(am_find_nsegment)(seg_starts[i]);
 
       if (!should_dump(seg))
 	 continue;

Modified: trunk/coregrind/m_coredump/coredump-solaris.c
==============================================================================
--- trunk/coregrind/m_coredump/coredump-solaris.c (original)
+++ trunk/coregrind/m_coredump/coredump-solaris.c Wed Jan 27 22:35:14 2016
@@ -920,7 +920,7 @@
    Int i;
    UInt num_phdrs = 2;		/* two CORE note sections */
    for (i = 0; i < n_seg_starts; i++) {
-      if (!may_dump(VG_(am_find_nsegment(seg_starts[i]))))
+      if (!may_dump(VG_(am_find_nsegment)(seg_starts[i])))
 	 continue;
 
       num_phdrs++;
@@ -1051,7 +1051,7 @@
    /* fill program headers for segments */
    UInt idx;
    for (i = 0, idx = 2; i < n_seg_starts; i++) {
-      NSegment const *seg = VG_(am_find_nsegment(seg_starts[i]));
+      NSegment const *seg = VG_(am_find_nsegment)(seg_starts[i]);
 
       if (!may_dump(seg))
 	 continue;
@@ -1078,7 +1078,7 @@
    VG_(lseek)(core_fd, phdrs[2].p_offset, VKI_SEEK_SET);
 
    for (i = 0, idx = 2; i < n_seg_starts; i++) {
-      NSegment const *seg = VG_(am_find_nsegment(seg_starts[i]));
+      NSegment const *seg = VG_(am_find_nsegment)(seg_starts[i]);
 
       if (!should_dump(seg))
 	 continue;

Modified: trunk/coregrind/m_debuginfo/debuginfo.c
==============================================================================
--- trunk/coregrind/m_debuginfo/debuginfo.c (original)
+++ trunk/coregrind/m_debuginfo/debuginfo.c Wed Jan 27 22:35:14 2016
@@ -2017,7 +2017,7 @@
       knows the name of the file associated with this mapping.  This
       allows us to print the names of exe/dll files in the stack trace
       when running programs under wine. */
-   if ( (seg = VG_(am_find_nsegment(a))) != NULL 
+   if ( (seg = VG_(am_find_nsegment)(a)) != NULL 
         && (filename = VG_(am_get_filename)(seg)) != NULL ) {
      *buf = filename;
       return True;

Modified: trunk/coregrind/m_debuginfo/readmacho.c
==============================================================================
--- trunk/coregrind/m_debuginfo/readmacho.c (original)
+++ trunk/coregrind/m_debuginfo/readmacho.c Wed Jan 27 22:35:14 2016
@@ -609,15 +609,15 @@
       if (cmd.cmd == LC_SEGMENT_CMD) {
          struct SEGMENT_COMMAND seg;
          ML_(cur_read_get)(&seg, cur, sizeof(seg));
-         if (0 == VG_(strncmp(&seg.segname[0],
-                              segname, sizeof(seg.segname)))) {
+         if (0 == VG_(strncmp)(&seg.segname[0],
+                               segname, sizeof(seg.segname))) {
             DiCursor sects_cur = ML_(cur_plus)(cur, sizeof(seg));
             Int s;
             for (s = 0; s < seg.nsects; s++) {
                struct SECTION sect;
                ML_(cur_step_get)(&sect, &sects_cur, sizeof(sect));
-               if (0 == VG_(strncmp(sect.sectname, sectname, 
-                                    sizeof(sect.sectname)))) {
+               if (0 == VG_(strncmp)(sect.sectname, sectname, 
+                                     sizeof(sect.sectname))) {
                   DiSlice res = img;
                   res.ioff = sect.offset;
                   res.szB = sect.size;

Modified: trunk/coregrind/m_initimg/initimg-linux.c
==============================================================================
--- trunk/coregrind/m_initimg/initimg-linux.c (original)
+++ trunk/coregrind/m_initimg/initimg-linux.c Wed Jan 27 22:35:14 2016
@@ -221,7 +221,7 @@
    /* ret[0 .. envc-1] is live now. */
    /* Find and remove a binding for VALGRIND_LAUNCHER. */
    for (i = 0; i < envc; i++)
-      if (0 == VG_(memcmp(ret[i], v_launcher, v_launcher_len)))
+      if (0 == VG_(memcmp)(ret[i], v_launcher, v_launcher_len))
          break;
 
    if (i < envc) {

Modified: trunk/coregrind/m_initimg/initimg-solaris.c
==============================================================================
--- trunk/coregrind/m_initimg/initimg-solaris.c (original)
+++ trunk/coregrind/m_initimg/initimg-solaris.c Wed Jan 27 22:35:14 2016
@@ -236,7 +236,7 @@
       SizeT v_launcher_len = VG_(strlen)(v_launcher);
 
       for (i = 0; i < envc; i++)
-         if (!VG_(memcmp(ret[i], v_launcher, v_launcher_len))) {
+         if (!VG_(memcmp)(ret[i], v_launcher, v_launcher_len)) {
             /* VALGRIND_LAUNCHER was found. */
             break;
          }

Modified: trunk/coregrind/m_libcbase.c
==============================================================================
--- trunk/coregrind/m_libcbase.c (original)
+++ trunk/coregrind/m_libcbase.c Wed Jan 27 22:35:14 2016
@@ -446,7 +446,7 @@
       s = *saveptr;
 
    /* Scan leading delimiters.  */
-   s += VG_(strspn (s, delim));
+   s += VG_(strspn) (s, delim);
    if (*s == '\0')
       {
          *saveptr = s;
@@ -455,7 +455,7 @@
 
    /* Find the end of the token.  */
    token = s;
-   s = VG_(strpbrk (token, delim));
+   s = VG_(strpbrk) (token, delim);
    if (s == NULL)
       /* This token finishes the string.  */
       *saveptr = token + VG_(strlen) (token);

Modified: trunk/coregrind/m_main.c
==============================================================================
--- trunk/coregrind/m_main.c (original)
+++ trunk/coregrind/m_main.c Wed Jan 27 22:35:14 2016
@@ -1315,7 +1315,7 @@
       VG_(printf_xml)("\n");
    }
 
-   if (VG_(clo_xml) || VG_(clo_verbosity > 0)) {
+   if (VG_(clo_xml) || VG_(clo_verbosity) > 0) {
 
       if (VG_(clo_xml))
          VG_(printf_xml)("<preamble>\n");

Modified: trunk/coregrind/m_signals.c
==============================================================================
--- trunk/coregrind/m_signals.c (original)
+++ trunk/coregrind/m_signals.c Wed Jan 27 22:35:14 2016
@@ -2910,7 +2910,7 @@
               );
    VG_(printf)("pp_ksigaction: { ");
    for (i = 1; i <= VG_(max_signal); i++)
-      if (VG_(sigismember(&(sa->sa_mask),i)))
+      if (VG_(sigismember)(&(sa->sa_mask),i))
          VG_(printf)("%d ", i);
    VG_(printf)("}\n");
 }

Modified: trunk/coregrind/m_syswrap/syswrap-solaris.c
==============================================================================
--- trunk/coregrind/m_syswrap/syswrap-solaris.c (original)
+++ trunk/coregrind/m_syswrap/syswrap-solaris.c Wed Jan 27 22:35:14 2016
@@ -426,7 +426,7 @@
          if (a != 0) {
             tst->os_state.schedctl_data = 0;
             a = VG_PGROUNDDN(a);
-            if (VG_(am_find_anon_segment(a)))
+            if (VG_(am_find_anon_segment)(a))
                VG_(am_notify_munmap)(a, VKI_PAGE_SIZE);
          }
       }
@@ -9023,7 +9023,7 @@
 
          if (params->rbuf) {
             Addr addr = (Addr)params->rbuf;
-            if (!VG_(am_find_anon_segment(addr))) {
+            if (!VG_(am_find_anon_segment)(addr)) {
                /* This segment is new and was mapped by the kernel. */
                UInt prot, flags;
                SizeT size;
@@ -9121,7 +9121,7 @@
    tst->os_state.schedctl_data = a;
 
    /* Returned address points to a block in a mapped page. */
-   if (!VG_(am_find_anon_segment(a))) {
+   if (!VG_(am_find_anon_segment)(a)) {
       Addr page = VG_PGROUNDDN(a);
       UInt prot = VKI_PROT_READ | VKI_PROT_WRITE | VKI_PROT_EXEC;
       UInt flags = VKI_MAP_ANONYMOUS;
@@ -9135,9 +9135,9 @@
       /* The kernel always places redzone before and after the allocated page.
          Check this assertion now; the tool can later request to allocate
          a Valgrind segment and aspacemgr will place it adjacent. */
-      const NSegment *seg = VG_(am_find_nsegment(page - 1));
+      const NSegment *seg = VG_(am_find_nsegment)(page - 1);
       vg_assert(seg == NULL || seg->kind == SkResvn);
-      seg = VG_(am_find_nsegment(page + VKI_PAGE_SIZE));
+      seg = VG_(am_find_nsegment)(page + VKI_PAGE_SIZE);
       vg_assert(seg == NULL || seg->kind == SkResvn);
 
       /* The address space manager works with whole pages. */

Modified: trunk/coregrind/m_transtab.c
==============================================================================
--- trunk/coregrind/m_transtab.c (original)
+++ trunk/coregrind/m_transtab.c Wed Jan 27 22:35:14 2016
@@ -2019,7 +2019,7 @@
                     guest_start, range, who );
 
    /* Pre-deletion sanity check */
-   if (VG_(clo_sanity_level >= 4)) {
+   if (VG_(clo_sanity_level) >= 4) {
       Bool sane = sanity_check_all_sectors();
       vg_assert(sane);
    }
@@ -2107,7 +2107,7 @@
    unredir_discard_translations( guest_start, range );
 
    /* Post-deletion sanity check */
-   if (VG_(clo_sanity_level >= 4)) {
+   if (VG_(clo_sanity_level) >= 4) {
       TTEno    i;
       TTEntry* tte;
       Bool     sane = sanity_check_all_sectors();

Modified: trunk/drd/drd_clientreq.c
==============================================================================
--- trunk/drd/drd_clientreq.c (original)
+++ trunk/drd/drd_clientreq.c Wed Jan 27 22:35:14 2016
@@ -80,7 +80,7 @@
    UWord result = 0;
    const DrdThreadId drd_tid = DRD_(thread_get_running_tid)();
 
-   tl_assert(vg_tid == VG_(get_running_tid()));
+   tl_assert(vg_tid == VG_(get_running_tid)());
    tl_assert(DRD_(VgThreadIdToDrdThreadId)(vg_tid) == drd_tid
              || (VG_USERREQ__GDB_MONITOR_COMMAND == arg[0]
                  && vg_tid == VG_INVALID_THREADID));

Modified: trunk/drd/drd_load_store.c
==============================================================================
--- trunk/drd/drd_load_store.c (original)
+++ trunk/drd/drd_load_store.c Wed Jan 27 22:35:14 2016
@@ -180,7 +180,7 @@
 #ifdef ENABLE_DRD_CONSISTENCY_CHECKS
    /* The assert below has been commented out because of performance reasons.*/
    tl_assert(DRD_(thread_get_running_tid)()
-             == DRD_(VgThreadIdToDrdThreadId)(VG_(get_running_tid())));
+             == DRD_(VgThreadIdToDrdThreadId)(VG_(get_running_tid)()));
 #endif
 
    if (DRD_(running_thread_is_recording_loads)()
@@ -246,7 +246,7 @@
 #ifdef ENABLE_DRD_CONSISTENCY_CHECKS
    /* The assert below has been commented out because of performance reasons.*/
    tl_assert(DRD_(thread_get_running_tid)()
-             == DRD_(VgThreadIdToDrdThreadId)(VG_(get_running_tid())));
+             == DRD_(VgThreadIdToDrdThreadId)(VG_(get_running_tid)()));
 #endif
 
    if (DRD_(running_thread_is_recording_stores)()

Modified: trunk/exp-sgcheck/pc_common.c
==============================================================================
--- trunk/exp-sgcheck/pc_common.c (original)
+++ trunk/exp-sgcheck/pc_common.c Wed Jan 27 22:35:14 2016
@@ -779,7 +779,7 @@
 SizeT pc_get_extra_suppression_info ( const Error* err,
                                       /*OUT*/HChar* buf, Int nBuf )
 {
-   ErrorKind ekind = VG_(get_error_kind )(err);
+   ErrorKind ekind = VG_(get_error_kind)(err);
    tl_assert(buf);
    tl_assert(nBuf >= 1);
 

Modified: trunk/helgrind/hg_main.c
==============================================================================
--- trunk/helgrind/hg_main.c (original)
+++ trunk/helgrind/hg_main.c Wed Jan 27 22:35:14 2016
@@ -284,7 +284,7 @@
          /* 2nd and subsequent locking of a lock by its owner */
          tl_assert(lk->heldW);
          /* assert: lk is only held by one thread .. */
-         tl_assert(VG_(sizeUniqueBag(lk->heldBy)) == 1);
+         tl_assert(VG_(sizeUniqueBag)(lk->heldBy) == 1);
          /* assert: .. and that thread is 'thr'. */
          tl_assert(VG_(elemBag)(lk->heldBy, (UWord)thr)
                    == VG_(sizeTotalBag)(lk->heldBy));
@@ -4902,7 +4902,7 @@
 static Bool handle_gdb_monitor_command (ThreadId tid, HChar *req)
 {
    HChar* wcmd;
-   HChar s[VG_(strlen(req))]; /* copy for strtok_r */
+   HChar s[VG_(strlen)(req)]; /* copy for strtok_r */
    HChar *ssaveptr;
    Int   kwdid;
 

Modified: trunk/massif/ms_main.c
==============================================================================
--- trunk/massif/ms_main.c (original)
+++ trunk/massif/ms_main.c Wed Jan 27 22:35:14 2016
@@ -2358,7 +2358,7 @@
 static Bool handle_gdb_monitor_command (ThreadId tid, HChar *req)
 {
    HChar* wcmd;
-   HChar s[VG_(strlen(req)) + 1]; /* copy for strtok_r */
+   HChar s[VG_(strlen)(req) + 1]; /* copy for strtok_r */
    HChar *ssaveptr;
 
    VG_(strcpy) (s, req);

Modified: trunk/memcheck/mc_errors.c
==============================================================================
--- trunk/memcheck/mc_errors.c (original)
+++ trunk/memcheck/mc_errors.c Wed Jan 27 22:35:14 2016
@@ -1349,7 +1349,7 @@
       if (eof) return True; // old LeakSupp style, no match-leak-kinds line.
       if (0 == VG_(strncmp)(*bufpp, "match-leak-kinds:", 17)) {
          i = 17;
-         while ((*bufpp)[i] && VG_(isspace((*bufpp)[i])))
+         while ((*bufpp)[i] && VG_(isspace)((*bufpp)[i]))
             i++;
          if (!VG_(parse_enum_set)(MC_(parse_leak_kinds_tokens),
                                   True/*allow_all*/,
@@ -1394,7 +1394,7 @@
 {
    Int       su_szB;
    MC_Error* extra = VG_(get_error_extra)(err);
-   ErrorKind ekind = VG_(get_error_kind )(err);
+   ErrorKind ekind = VG_(get_error_kind)(err);
 
    switch (VG_(get_supp_kind)(su)) {
       case ParamSupp:
@@ -1522,7 +1522,7 @@
 SizeT MC_(get_extra_suppression_info) ( const Error* err,
                                         /*OUT*/HChar* buf, Int nBuf )
 {
-   ErrorKind ekind = VG_(get_error_kind )(err);
+   ErrorKind ekind = VG_(get_error_kind)(err);
    tl_assert(buf);
    tl_assert(nBuf >= 1);
 

Modified: trunk/memcheck/mc_main.c
==============================================================================
--- trunk/memcheck/mc_main.c (original)
+++ trunk/memcheck/mc_main.c Wed Jan 27 22:35:14 2016
@@ -6150,7 +6150,7 @@
 static Bool handle_gdb_monitor_command (ThreadId tid, HChar *req)
 {
    HChar* wcmd;
-   HChar s[VG_(strlen(req)) + 1]; /* copy for strtok_r */
+   HChar s[VG_(strlen)(req) + 1]; /* copy for strtok_r */
    HChar *ssaveptr;
 
    VG_(strcpy) (s, req);