summaryrefslogtreecommitdiff
path: root/sanity.c
diff options
context:
space:
mode:
authorAaron Plattner <aplattner@nvidia.com>2008-02-13 10:20:38 -0800
committerAaron Plattner <aplattner@nvidia.com>2008-02-13 10:20:38 -0800
commit4d3c391aebad3c67ef9e77eba3fe86acc79541f5 (patch)
tree36bca53f74716b5bd9c474c0ef933006faf1a2bb /sanity.c
parent184ddefeab802bc3b119c49dede0d49fc5e01670 (diff)
100.14.03100.14.03
Diffstat (limited to 'sanity.c')
-rw-r--r--sanity.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/sanity.c b/sanity.c
index 3af6796..dba0ee3 100644
--- a/sanity.c
+++ b/sanity.c
@@ -45,14 +45,14 @@
int sanity(Options *op)
{
- char *descr;
- int major, minor, patch;
+ char *descr, *version;
+ int ret;
/* check that there's a driver installed at all */
- descr = get_installed_driver_version_and_descr(op, &major, &minor, &patch);
+ ret = get_installed_driver_version_and_descr(op, &version, &descr);
- if (!descr) {
+ if (!ret) {
ui_error(op, "Unable to find any installed NVIDIA driver. The sanity "
"check feature is only intended to be used with an existing "
"NVIDIA driver installation.");
@@ -60,9 +60,9 @@ int sanity(Options *op)
}
ui_message(op, "The currently installed driver is: '%s' "
- "(version: %d.%d-%d). nvidia-installer will now check "
+ "(version: %s). nvidia-installer will now check "
"that all installed files still exist.",
- descr, major, minor, patch);
+ descr, version);
/* check that all the files are still where we placed them */
@@ -91,11 +91,12 @@ int sanity(Options *op)
* etc).
*/
- ui_message(op, "'%s' (version: %d.%d-%d) appears to be installed "
- "correctly.", descr, major, minor, patch);
+ ui_message(op, "'%s' (version: %s) appears to be installed "
+ "correctly.", descr, version);
nvfree(descr);
-
+ nvfree(version);
+
return TRUE;
} /* sanity() */