Merge pull request #14 from uyjulian/cleanup1

General cleanup 1

Author: fjtrujy

README.md

@@ -2,14 +2,14 @@
 
 ![CI](https://github.com/ps2dev/ps2client/workflows/CI/badge.svg)
 
-
 ## PS2CLIENT USAGE AND INFORMATION
 
 ### THE INTRODUCTION
 
 These programs, ps2client & fsclient, are command line tools used for interacting with a ps2 system running ps2link and/or ps2netfs. It will allow you to send various commands as well as respond to requests for data. This program was written and tested under Linux, Cygwin and Mac OS X but should compile on any reasonably unixlike system.
 
 ### BUILDING THE CLIENTS
+
 Building and installing is very simple:
 
 `make clean; make install`
@@ -26,80 +26,83 @@ These options can be used as follows:
 `make clean; make PREFIX=/new/path/prefix install`
 
 ### BUILDING WINDOWS BINARIES
+
 For building windows binaries on Unix system, you need to setup mingw cross-compiler and win32 threads.
 Build command:
 
 `make -f Makefile.mingw32`
 
 ### BASIC CLIENT USAGE
+
 Basic usage:
 
-```
+```txt
 ps2client [-h hostname] [-t timeout] <command> [arguments]
 fsclient [-h hostname] <command> <arguments>
 ```
 
-**[-h hostname]**
+#### \[-h hostname]
 
 The address of the remote ps2. This can be an IP or a hostname. If none is given, the environment variable `$PS2HOSTNAME` will be checked for a valid address. If this variable isn't set, a default of 192.168.0.10 will be used.
 
-**[-t timeout]**
+#### \[-t timeout]
 
 An idle timeout period in seconds that the client will wait before exiting. This is useful to allow a script to continue after calling ps2client to send a command to ps2link or ps2netfs.
 
 ### PS2LINK COMMANDS
-- `reset`
+
+*   `reset`
 
 Send a reset request to ps2link.
 
-- `execiop <filename> [arguments]`
+*   `execiop <filename> [arguments]`
 
 Tell ps2link to load and execute a file on the IOP.
 
-- `execee <filename> [arguments]`
+*   `execee <filename> [arguments]`
 
 Tell ps2link to load and execute a file on the EE.
 
-- `poweroff`
+*   `poweroff`
 
 Send a poweroff request to ps2link.
 
-- `scrdump`
+*   `scrdump`
 
 Tell ps2link to dump exceptions to the screen.
 
-- `netdump`
+*   `netdump`
 
 Tell ps2link to dump execetions to the network console.
 
-- `dumpmem <offset> <size> <filename>`
+*   `dumpmem <offset> <size> <filename>`
 
 Dump the contents of memory into a file.
 
-- `startvu <vu>`
+*   `startvu <vu>`
 
 Tell the specified vector unit to start operation.
 
-- `stopvu <vu>`
+*   `stopvu <vu>`
 
 Tell the specified vector unit to stop operation.
 
-- `dumpreg <type> <filename>`
+*   `dumpreg <type> <filename>`
 
 Dump the registers of a given type into a file.
 
-- `gsexec <size> <filename>`
+*   `gsexec <size> <filename>`
 
 Tell ps2link to load and send a file to the GS.
 
-- `writemem <offset> <size> <filename>`
+*   `writemem <offset> <size> <filename>`
 
 Write the contents of a file into memory.
 
-- `iopexcep`
+*   `iopexcep`
 
 I really don't know! OH NOES!!
 
-- `listen`
+*   `listen`
 
 Listen to the ps2link network console.

src/fsclient.c

@@ -212,12 +212,12 @@
 
  }
 
- int fsclient_devlist(void) { int result = 0;
+ int fsclient_devlist(void) {
   int loop0, devcount; char devlist[256], *temp = devlist;
 
   // Get the device listing.
   devcount = ps2netfs_command_devlist("", 0, devlist);
-  if (devcount < 0) { printf("Error: Get device listing failed. (%d)\n", result); return -1; }
+  if (devcount < 0) { printf("Error: Get device listing failed. (%d)\n", devcount); return -1; }
 
   // Output the display header.
   printf("\n [Active Devices]\n\n");

src/ps2link.c

@@ -326,13 +326,13 @@
 
  int ps2link_request_read(void *packet) {
   struct { unsigned int number; unsigned short length; int fd; int size; } PACKED *request = packet;
-  int result = -1, size = -1; char buffer[65536], *bigbuffer;
+  int result = -1, size = -1; char buffer[65536];
 
   // If a big read is requested...
   if (ntohl(request->size) > sizeof(buffer)) {
 
    // Allocate the bigbuffer.
-   bigbuffer = malloc(ntohl(request->size));
+   char *bigbuffer = malloc(ntohl(request->size));
 
    // Perform the request.
    result = size = read(ntohl(request->fd), bigbuffer, ntohl(request->size));
@@ -367,13 +367,13 @@
 
  int ps2link_request_write(void *packet) {
   struct { unsigned int number; unsigned short length; int fd; int size; } PACKED *request = packet;
-  int result = -1; char buffer[65536], *bigbuffer;
+  int result = -1; char buffer[65536];
 
   // If a big write is requested...
   if (ntohl(request->size) > sizeof(buffer)) {
 
    // Allocate the bigbuffer.
-   bigbuffer = malloc(ntohl(request->size));
+   char *bigbuffer = malloc(ntohl(request->size));
 
    // Read the request data.
    network_receive_all(request_socket, bigbuffer, ntohl(request->size));
@@ -418,7 +418,7 @@
 
  }
 
- int ps2link_request_opendir(void *packet) { int loop0 = 0;
+ int ps2link_request_opendir(void *packet) {
   struct { unsigned int command; unsigned short length; int flags; char pathname[256]; } PACKED *request = packet;
   int result = -1;
   struct stat stats;
@@ -429,7 +429,7 @@
   if((stat(request->pathname, &stats) == 0) && (S_ISDIR(stats.st_mode)))
   {
       // Allocate an available directory descriptor.
-      for (loop0=0; loop0<10; loop0++) { if (ps2link_dd[loop0].dir == NULL) { result = loop0; break; } }
+      for (int loop0=0; loop0<10; loop0++) { if (ps2link_dd[loop0].dir == NULL) { result = loop0; break; } }
 
       // Perform the request.
       if (result != -1)