Fix xcalloc() calls so order of arguments is not reversed.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d43b5fa3d0f5d697c42e9f1625cc264abb1cbdc2..fbb7139180cac818627c9a52691625c4a75b24a8 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2002-01-22  Kevin Buettner  <kevinb@redhat.com>
+
+       * solib-aix5.c (build_so_list_from_mapfile)
+       (aix5_relocate_main_executable): Fix xcalloc() calls so order of
+       arguments is not reversed.
+       * solib-sunos.c (sunos_relocate_main_executable): Likewise.
+       * solib-svr4.c (svr4_relocate_main_executable): Likewise.
+       
 2002-01-22  Elena Zannoni  <ezannoni@redhat.com>
 
        * sh-tdep.c (sh_pseudo_register_read): New function. Renamed and

diff --git a/gdb/solib-aix5.c b/gdb/solib-aix5.c
index 54cb16f388e592aeabc7f29f3d5e44e20ba93cdf..1a8c9dfeea94d8ae575f0e25eb25decb2803bd82 100644 (file)
--- a/gdb/solib-aix5.c
+++ b/gdb/solib-aix5.c
@@ -262,9 +262,9 @@ build_so_list_from_mapfile (int pid, long match_mask, long match_val)
 
       if (sop == NULL)
        {
-         sop = xcalloc (sizeof (struct so_list), 1);
+         sop = xcalloc (1, sizeof (struct so_list));
          make_cleanup (xfree, sop);
-         sop->lm_info = xcalloc (sizeof (struct lm_info), 1);
+         sop->lm_info = xcalloc (1, sizeof (struct lm_info));
          make_cleanup (xfree, sop->lm_info);
          sop->lm_info->mapname = xstrdup (mapname);
          make_cleanup (xfree, sop->lm_info->mapname);
@@ -714,8 +714,8 @@ aix5_relocate_main_executable (void)
 
   /* Allocate the data structure which'll contain the new offsets to
      relocate by.  Initialize it so it contains the current offsets.  */
-  new_offsets = xcalloc (sizeof (struct section_offsets),
-                         symfile_objfile->num_sections);
+  new_offsets = xcalloc (symfile_objfile->num_sections,
+                        sizeof (struct section_offsets));
   make_cleanup (xfree, new_offsets);
   for (i = 0; i < symfile_objfile->num_sections; i++)
     new_offsets->offsets[i] = ANOFFSET (symfile_objfile->section_offsets, i);

diff --git a/gdb/solib-sunos.c b/gdb/solib-sunos.c
index 304657c52eac53c2f48e05fa74e30b3cae6e3336..0f81d05efa45747b53916d97b450046d039f92f7 100644 (file)
--- a/gdb/solib-sunos.c
+++ b/gdb/solib-sunos.c
@@ -728,8 +728,8 @@ sunos_relocate_main_executable (void)
       displacement = pc - bfd_get_start_address (exec_bfd);
       changed = 0;
 
-      new_offsets = xcalloc (sizeof (struct section_offsets),
-                            symfile_objfile->num_sections);
+      new_offsets = xcalloc (symfile_objfile->num_sections,
+                            sizeof (struct section_offsets));
       old_chain = make_cleanup (xfree, new_offsets);
 
       for (i = 0; i < symfile_objfile->num_sections; i++)

diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
index 987e776df3ad392c2887d2275198d31439e6da04..f46326f68c3a097ae4b0543119264abe031630b7 100644 (file)
--- a/gdb/solib-svr4.c
+++ b/gdb/solib-svr4.c
@@ -1110,8 +1110,8 @@ svr4_relocate_main_executable (void)
       displacement = pc - bfd_get_start_address (exec_bfd);
       changed = 0;
 
-      new_offsets = xcalloc (sizeof (struct section_offsets),
-                            symfile_objfile->num_sections);
+      new_offsets = xcalloc (symfile_objfile->num_sections,
+                            sizeof (struct section_offsets));
       old_chain = make_cleanup (xfree, new_offsets);
 
       for (i = 0; i < symfile_objfile->num_sections; i++)