|
From: <sv...@va...> - 2006-10-03 19:36:47
|
Author: sewardj
Date: 2006-10-03 20:36:44 +0100 (Tue, 03 Oct 2006)
New Revision: 6144
Log:
Track SysRes changes and VG_(bad_option) renaming.
Modified:
branches/AIX5/massif/ms_main.c
Modified: branches/AIX5/massif/ms_main.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/AIX5/massif/ms_main.c 2006-10-03 19:35:53 UTC (rev 6143)
+++ branches/AIX5/massif/ms_main.c 2006-10-03 19:36:44 UTC (rev 6144)
@@ -35,6 +35,7 @@
// structures below for more info on how things work.
=20
#include "pub_tool_basics.h"
+#include "pub_tool_vki.h"
#include "pub_tool_aspacemgr.h"
#include "pub_tool_debuginfo.h"
#include "pub_tool_hashtable.h"
@@ -297,7 +298,7 @@
n_alloc_fns++;
if (n_alloc_fns >=3D MAX_ALLOC_FNS) {
VG_(printf)("Too many alloc functions specified, sorry");
- VG_(bad_option)(arg);
+ VG_(err_bad_option)(arg);
}
}
=20
@@ -1287,7 +1288,7 @@
file_err( hp_file );
return;
} else {
- fd =3D sres.val;
+ fd =3D sres.res;
}
=20
// File header, including command line
@@ -1600,7 +1601,7 @@
file_err( text_file );
return;
} else {
- fd =3D sres.val;
+ fd =3D sres.res;
}
=20
// Header
|