71 lines
1.9 KiB
Diff
71 lines
1.9 KiB
Diff
|
diff -rupN nvdock-1.02/src/nvdock.c nvdock-1.02_mod/src/nvdock.c
|
||
|
|
--- nvdock-1.02/src/nvdock.c 2007-10-19 12:05:06.000000000 +0200
|
||
|
|
+++ nvdock-1.02_mod/src/nvdock.c 2011-03-22 18:17:01.478213919 +0100
|
||
|
|
@@ -40,7 +40,7 @@ bob_main_quit(void) {
|
||
|
|
return;
|
||
|
|
}
|
||
|
|
|
||
|
|
-int main(int argc, char *argv) {
|
||
|
|
+int main(int argc, char **argv) {
|
||
|
|
|
||
|
|
if(!exists_application("cut") || !exists_application("grep")) {
|
||
|
|
puts("error: make sure `cut` and `grep` are installed.");
|
||
|
|
@@ -59,7 +59,7 @@ int main(int argc, char *argv) {
|
||
|
|
|
||
|
|
unsigned int pid = 0;
|
||
|
|
|
||
|
|
- arg = (argstruct *)argc_argv_parse(argc,argv);
|
||
|
|
+ argc_argv_parse(argc,argv);
|
||
|
|
|
||
|
|
//. more preliminary checks.
|
||
|
|
arg->has_nvclock = exists_application("nvclock");
|
||
|
|
diff -rupN nvdock-1.02/src/nvdock.h nvdock-1.02_mod/src/nvdock.h
|
||
|
|
--- nvdock-1.02/src/nvdock.h 2007-10-19 12:07:19.000000000 +0200
|
||
|
|
+++ nvdock-1.02_mod/src/nvdock.h 2011-03-23 00:38:31.472213662 +0100
|
||
|
|
@@ -79,13 +79,15 @@ typedef struct _argc_argv {
|
||
|
|
gboolean has_nvclock:1;
|
||
|
|
gboolean has_nvclock_gtk:1;
|
||
|
|
|
||
|
|
- unsigned char nvversion[32];
|
||
|
|
+ char nvversion[32];
|
||
|
|
|
||
|
|
} argstruct;
|
||
|
|
|
||
|
|
argstruct *arg;
|
||
|
|
BobStatusIcon *bsi;
|
||
|
|
|
||
|
|
+void argc_argv_parse(int argc, char **argv);
|
||
|
|
+
|
||
|
|
gboolean exists_application(const char *);
|
||
|
|
gboolean exists_icon_file(const char *);
|
||
|
|
|
||
|
|
diff -rupN nvdock-1.02/src/util.c nvdock-1.02_mod/src/util.c
|
||
|
|
--- nvdock-1.02/src/util.c 2007-11-24 12:17:51.000000000 +0100
|
||
|
|
+++ nvdock-1.02_mod/src/util.c 2011-03-22 18:17:22.350213797 +0100
|
||
|
|
@@ -33,14 +33,14 @@ The NVIDIA name and Logo are property of
|
||
|
|
|
||
|
|
#include "nvdock.h"
|
||
|
|
|
||
|
|
-argstruct *
|
||
|
|
+void
|
||
|
|
argc_argv_parse(int argc, char **argv) {
|
||
|
|
|
||
|
|
//. this function requires the typedef struct _argc_argv, which has been
|
||
|
|
//. placed in nvdock.h for this application.
|
||
|
|
|
||
|
|
int a = 1;
|
||
|
|
- argstruct *arg = (argstruct *)malloc(sizeof(argstruct));
|
||
|
|
+ arg = (argstruct *)malloc(sizeof(argstruct));
|
||
|
|
|
||
|
|
arg->version = 0;
|
||
|
|
arg->help = 0;
|
||
|
|
@@ -78,8 +78,6 @@ argc_argv_parse(int argc, char **argv) {
|
||
|
|
|
||
|
|
++a;
|
||
|
|
}
|
||
|
|
-
|
||
|
|
- return arg;
|
||
|
|
}
|
||
|
|
|
||
|
|
int
|