Fix some lintian warnings. Patch by sergio-br2.

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1498 a31d4220-a93d-0410-bf67-fe4944624d44

doc/ReadMe.MFC.txt

@@ -97,7 +97,7 @@ Less important:
 
 - Merge HQ2x/LQ2x C code into code for HQ3x/4x
 
-- Apply pixel filter to sprites and BG seperately for better image quality
+- Apply pixel filter to sprites and BG separately for better image quality
 
 - Add CGB Bios support
 
@@ -175,4 +175,4 @@ shuffle2:
 - various build fixes
 
 Squarepusher
-- Libretro merge
+- Libretro merge

src/gba/BreakpointStructures.cpp

@@ -9,13 +9,13 @@ Bit		Value
 3 -		THUMB
 4 -		Always on Write		
 5 -		Always on Read
-6 -		Always on ARM
-7 -		Always on THUMB
-
-Each flag is independant, and can be used as such, as well as together.
-You can define a break on access (0xf), break on IO (0x3), break on 
-execution(0xc) or any other combination you need. 0xf0 will always break on
-any passage through the address
+6 -		Always on ARM
+7 -		Always on THUMB
+
+Each flag is independent, and can be used as such, as well as together.
+You can define a break on access (0xf), break on IO (0x3), break on 
+execution(0xc) or any other combination you need. 0xf0 will always break on
+any passage through the address
 
 This structure is accompanied by two other structures for the accesses.
 One of them is the Conditional structure. It's available for all types.
@@ -53,13 +53,13 @@ Instructions that accept this kind of implementation will follow this pattern
 if <EXP_addr> <addr_type><op><val_type> <EXP_val> [<;>OR<||>OR<&&> [repeat]
 if indicates that the following there is a condition. no If counts as always break
 <EXP_addr> is the first value expression, that unlike what the name implies, may be
-anything.
-<op> is one of the comparation Operands. Full list bellow
-<EXP_val> is the value to compare to.
-Following can be a ||(or), that adds a second, independant break condition, or
-a &&(and), that specifies that the next condition is a conjoined requisite to the break.
-EX: [0x03005000] == 0x77777777 && 0x50 == [0x03005000]
-	Would be impossible, but tested anyway, and make it never break due to this condition.
+anything.
+<op> is one of the comparation Operands. Full list bellow
+<EXP_val> is the value to compare to.
+Following can be a ||(or), that adds a second, independent break condition, or
+a &&(and), that specifies that the next condition is a conjoined requisite to the break.
+EX: [0x03005000] == 0x77777777 && 0x50 == [0x03005000]
+	Would be impossible, but tested anyway, and make it never break due to this condition.
 	[0x03005000] == 0x77777777 || 0x50 == [0x03005000]
 	Would make it break when the contents of 0x03005000 were either 0x77777777 or 0x50
 

src/gba/remote.cpp

@@ -2472,7 +2472,7 @@ void debuggerUsage(char *cmd)
 		monprintf("cond is the condition to be evaluated.\n");
 		monprintf("If && or || are not present, the chain of evaluation stops.\n");
 		monprintf("&& states the next condition must happen with the previous one, or the break\nfails.\n");
-		monprintf("|| states the next condition is independant from the last one, and break\nseperately.\n\n");
+		monprintf("|| states the next condition is independent from the last one, and break\nseparately.\n\n");
 		monprintf("Type can be:\n");
 		monprintf("   [u8, b, byte],[u16, h, hword, halfword],[u32,w, word]\n");
 		monprintf("   [s8, sb, sbyte],[s16, sh, shword, short, shalfword],[s32, int, sw, word]\n");

src/gtk/gvbam.desktop

@@ -1,10 +1,11 @@
 [Desktop Entry]
 Version=1.0
 Type=Application
-Name=VBA-M
+Name=VBA-M (GTK+ frontend)
 GenericName=Game Boy Advance Emulator
 Comment=Nintendo Game Boy Advance Emulator
 Exec=gvbam %f
 Icon=vbam
 Categories=Game;Emulator;GTK;
+Keywords=emulator;Nintendo;gameboy;Game Boy;Game Boy Color;Game Boy Advance;
 MimeType=application/x-gameboy-rom;application/x-gameboy-advance-rom;application/x-dmg-rom;application/x-agb-rom;application/x-gb-rom;application/x-gba-rom;

src/gtk/windowcallbacks.cpp

@@ -577,16 +577,16 @@ bool Window::bOnEmuSaveStateRewind() {
   } // otherwise we can reserve more memory
 
   // Do the actual saving
-  long ressize;
-  if (m_stEmulator.emuWriteMemState(m_psavestate, SZSTATE, ressize)) {
-    /*ressize*=2; // if tell does not return correct size this leverage factor is needed
-    if (ressize > SZSTATE) ressize = SZSTATE;*/
-    g_assert( ressize <= SZSTATE );
-    ressize+=(sizeof(ressize)*8); // some leverage
-    psavestate = new char[ressize];
-    memmove(psavestate, &ressize, sizeof(ressize)); // pack size first
-    memmove(psavestate+sizeof(ressize), m_psavestate, ressize-sizeof(ressize)); // then actual save data
-    //printf("Wrote %p (%li bytes %i %i)\n", psavestate, ressize, *((long*)psavestate), sizeof(ressize));
+  long resize;
+  if (m_stEmulator.emuWriteMemState(m_psavestate, SZSTATE, resize)) {
+    /*resize*=2; // if tell does not return correct size this leverage factor is needed
+    if (resize > SZSTATE) resize = SZSTATE;*/
+    g_assert( resize <= SZSTATE );
+    resize+=(sizeof(resize)*8); // some leverage
+    psavestate = new char[resize];
+    memmove(psavestate, &resize, sizeof(resize)); // pack size first
+    memmove(psavestate+sizeof(resize), m_psavestate, resize-sizeof(resize)); // then actual save data
+    //printf("Wrote %p (%li bytes %i %i)\n", psavestate, resize, *((long*)psavestate), sizeof(resize));
     m_rewind_load_q.push_front(psavestate);
     return true;
   } else {

src/sdl/SDL.cpp

@@ -1438,14 +1438,14 @@ void handleRewinds()
 		rewindCount = REWIND_NUM;
 
 	curSavePos	= (rewindTopPos + 1) % rewindCount; // [1] depends on previous
-	long ressize;
+	long resize;
 	if(
 			emulator.emuWriteMemState
 		&&
 			emulator.emuWriteMemState(
 				&rewindMemory[curSavePos*REWIND_SIZE],
 				REWIND_SIZE, /* available*/
-				ressize /* actual size */
+				resize /* actual size */
 			)
 	) {
 		char rewMsgBuf[100];
@@ -2208,4 +2208,4 @@ void log(const char *defaultMsg, ...)
   va_start(valist, defaultMsg);
   vfprintf(out, defaultMsg, valist);
   va_end(valist);
-}
+}

src/win32/VBA.cpp

@@ -1316,9 +1316,9 @@ BOOL VBA::OnIdle(LONG lCount)
         rewindCount++;
         if(rewindCount > 8)
           rewindCount = 8;
-        long ressize;
+        long resize;
         if(emulator.emuWriteMemState(&rewindMemory[rewindPos*REWIND_SIZE],
-                                     REWIND_SIZE, ressize)) { /* available and actual size */
+                                     REWIND_SIZE, resize)) { /* available and actual size */
           rewindPos = ++rewindPos & 7;
           if(rewindCount == 8)
             rewindTopPos = ++rewindTopPos & 7;

src/wx/panel.cpp

@@ -1107,10 +1107,10 @@ void GameArea::OnIdle(wxIdleEvent &event)
 			return;
 		}
 
-		long ressize;
+		long resize;
 
 		if (!emusys->emuWriteMemState(&rewind_mem[REWIND_SIZE * next_rewind_state],
-		                              REWIND_SIZE, ressize /* actual size */))
+		                              REWIND_SIZE, resize /* actual size */))
 			// if you see a lot of these, maybe increase REWIND_SIZE
 			wxLogInfo(_("Error writing rewind state"));
 		else

src/wx/wxvbam.desktop

@@ -7,4 +7,5 @@ Comment=Nintendo Game Boy Advance Emulator
 Exec=wxvbam %f
 Icon=vbam
 Categories=Game;Emulator;
+Keywords=emulator;Nintendo;gameboy;Game Boy;Game Boy Color;Game Boy Advance;
 MimeType=application/x-gameboy-rom;application/x-gameboy-advance-rom;application/x-dmg-rom;application/x-agb-rom;application/x-gb-rom;application/x-gba-rom;