Rename variables sectorbuf and verbose to avoid clashes in rbutil. Cleanup exports a bit.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17730 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 2 insertions, 4 deletions

diff --git a/rbutil/ipodpatcher/main.c b/rbutil/ipodpatcher/main.c
index 6b3e8ddda6..585f7277dd 100644
--- a/rbutil/ipodpatcher/main.c
+++ b/rbutil/ipodpatcher/main.c
@@ -31,8 +31,6 @@
 
 #define VERSION "2.0 with v2.0 bootloaders"
 
-int verbose = 0;
-
 enum {
    NONE,
 #ifdef WITH_BOOTOBJS
@@ -155,7 +153,7 @@ int main(int argc, char* argv[])
         return 1;
     }
 
-    if (ipod_alloc_buffer(&sectorbuf,BUFFER_SIZE) < 0) {
+    if (ipod_alloc_buffer(&ipod_sectorbuf,BUFFER_SIZE) < 0) {
         fprintf(stderr,"Failed to allocate memory buffer\n");
     }
 
@@ -297,7 +295,7 @@ int main(int argc, char* argv[])
             i++;
         } else if ((strcmp(argv[i],"-v")==0) || 
                    (strcmp(argv[i],"--verbose")==0)) {
-            verbose++;
+            ipod_verbose++;
             i++;
         } else if ((strcmp(argv[i],"-f")==0) || 
                    (strcmp(argv[i],"--format")==0)) {