Rename print_error() in ipodpatcher and sansapatcher.

Both patchers use the same function name with one being removed when
building for rbutil. This gets in the way trying to move the patchers to
libraries, and it also results a linking dependency of sansapatcher on
ipodpatcher. Renaming the function makes both more self-contained and
avoids potential issues if the functions happen to not do the same.

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

4 files changed, 14 insertions, 17 deletions

diff --git a/rbutil/sansapatcher/sansaio-posix.c b/rbutil/sansapatcher/sansaio-posix.c
index 4c28afa..56f755a 100644
--- a/rbutil/sansapatcher/sansaio-posix.c
+++ b/rbutil/sansapatcher/sansaio-posix.c
@@ -65,12 +65,10 @@ static int sansa_unmount(struct sansa_t* sansa)
 #endif
 
 
-#ifndef RBUTIL
-void print_error(char* msg)
+void sansa_print_error(char* msg)
 {
     perror(msg);
 }
-#endif
 
 int sansa_open(struct sansa_t* sansa, int silent)
 {
diff --git a/rbutil/sansapatcher/sansaio-win32.c b/rbutil/sansapatcher/sansaio-win32.c
index 2b93d28..c270927 100644
--- a/rbutil/sansapatcher/sansaio-win32.c
+++ b/rbutil/sansapatcher/sansaio-win32.c
@@ -55,8 +55,7 @@ static int unlock_volume(HANDLE hDisk)
                          &dummy, NULL);
 }
 
-#ifndef RBUTIL
-void print_error(char* msg)
+void sansa_print_error(char* msg)
 {
     char* pMsgBuf;
 
@@ -68,7 +67,7 @@ void print_error(char* msg)
     printf(pMsgBuf);
     LocalFree(pMsgBuf);
 }
-#endif
+
 int sansa_open(struct sansa_t* sansa, int silent)
 {
     DISK_GEOMETRY_EX diskgeometry_ex;
@@ -80,7 +79,7 @@ int sansa_open(struct sansa_t* sansa, int silent)
                     FILE_FLAG_WRITE_THROUGH | FILE_FLAG_NO_BUFFERING, NULL);
 
     if (sansa->dh == INVALID_HANDLE_VALUE) {
-        if (!silent) print_error(" Error opening disk: ");
+        if (!silent) sansa_print_error(" Error opening disk: ");
         if(GetLastError() == ERROR_ACCESS_DENIED)
             return -2;
         else
@@ -88,7 +87,7 @@ int sansa_open(struct sansa_t* sansa, int silent)
     }
 
     if (!lock_volume(sansa->dh)) {
-        if (!silent) print_error(" Error locking disk: ");
+        if (!silent) sansa_print_error(" Error locking disk: ");
         return -1;
     }
 
@@ -108,7 +107,7 @@ int sansa_open(struct sansa_t* sansa, int silent)
                              sizeof(diskgeometry),
                              &n,
                              NULL)) {
-            if (!silent) print_error(" Error reading disk geometry: ");
+            if (!silent) sansa_print_error(" Error reading disk geometry: ");
             return -1;
         } else {
             sansa->sector_size=diskgeometry.BytesPerSector;
@@ -131,12 +130,12 @@ int sansa_reopen_rw(struct sansa_t* sansa)
                      FILE_FLAG_WRITE_THROUGH | FILE_FLAG_NO_BUFFERING, NULL);
 
     if (sansa->dh == INVALID_HANDLE_VALUE) {
-        print_error(" Error opening disk: ");
+        sansa_print_error(" Error opening disk: ");
         return -1;
     }
 
     if (!lock_volume(sansa->dh)) {
-        print_error(" Error locking disk: ");
+        sansa_print_error(" Error locking disk: ");
         return -1;
     }
 
@@ -156,7 +155,7 @@ int sansa_alloc_buffer(unsigned char** sectorbuf, int bufsize)
        the disk sector size. */
     *sectorbuf = (unsigned char*)VirtualAlloc(NULL, bufsize, MEM_COMMIT, PAGE_READWRITE);
     if (*sectorbuf == NULL) {
-        print_error(" Error allocating a buffer: ");
+        sansa_print_error(" Error allocating a buffer: ");
         return -1;
     }
     return 0;
@@ -171,7 +170,7 @@ int sansa_seek(struct sansa_t* sansa, loff_t pos)
     li.LowPart = SetFilePointer (sansa->dh, li.LowPart, &li.HighPart, FILE_BEGIN);
 
     if (li.LowPart == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR) {
-        print_error(" Seek error ");
+        sansa_print_error(" Seek error ");
         return -1;
     }
     return 0;
@@ -182,7 +181,7 @@ int sansa_read(struct sansa_t* sansa, unsigned char* buf, int nbytes)
     unsigned long count;
 
     if (!ReadFile(sansa->dh, buf, nbytes, &count, NULL)) {
-        print_error(" Error reading from disk: ");
+        sansa_print_error(" Error reading from disk: ");
         return -1;
     }
 
@@ -194,7 +193,7 @@ int sansa_write(struct sansa_t* sansa, unsigned char* buf, int nbytes)
     unsigned long count;
 
     if (!WriteFile(sansa->dh, buf, nbytes, &count, NULL)) {
-        print_error(" Error writing to disk: ");
+        sansa_print_error(" Error writing to disk: ");
         return -1;
     }
 
diff --git a/rbutil/sansapatcher/sansaio.h b/rbutil/sansapatcher/sansaio.h
index 5fd98a1..9563b57 100644
--- a/rbutil/sansapatcher/sansaio.h
+++ b/rbutil/sansapatcher/sansaio.h
@@ -65,7 +65,7 @@ struct sansa_t {
     loff_t start;  /* Offset in bytes of firmware partition from start of disk */
 };
 
-void print_error(char* msg);
+void sansa_print_error(char* msg);
 int sansa_open(struct sansa_t* sansa, int silent);
 int sansa_reopen_rw(struct sansa_t* sansa);
 int sansa_close(struct sansa_t* sansa);
diff --git a/rbutil/sansapatcher/sansapatcher.c b/rbutil/sansapatcher/sansapatcher.c
index 015e5cb..69e89e9 100644
--- a/rbutil/sansapatcher/sansapatcher.c
+++ b/rbutil/sansapatcher/sansapatcher.c
@@ -99,7 +99,7 @@ int sansa_read_partinfo(struct sansa_t* sansa, int silent)
     count = sansa_read(sansa,sansa_sectorbuf, sansa->sector_size);
 
     if (count <= 0) {
-        print_error(" Error reading from disk: ");
+        sansa_print_error(" Error reading from disk: ");
         return -1;
     }