Merge pull request #30 from cfriedtpv/kb/4299/server-fix-small-compiler-warnings-and-errors

Kb/4299/server fix small compiler warnings and errors

Author: DanielMcLean

hal/properties.c

@@ -4550,7 +4550,7 @@ static int hdlr_fpga_about_cmp_time (const char* data, char* ret) {
 }
 
 static int hdlr_fpga_about_conf_info (const char* data, char* ret){
-	uint64_t old_val;
+	uint32_t old_val;
 	read_hps_reg ( "sys18", &old_val);
 
 	sprintf(ret,  "config. info. 0x%02x \n", old_val);
@@ -4565,7 +4565,7 @@ static int hdlr_fpga_about_serial (const char* data, char* ret){
 	read_hps_reg ( "sys17", &old_val2);
 
 	//append values
-	old_val = (old_val2 << 32) | old_val1;
+	old_val = ((uint64_t)old_val2 << 32) | (uint64_t)old_val1;
 
 	sprintf(ret, "serial number 0x%02x%02x \n", old_val2, old_val1);
 	return RETURN_SUCCESS;
@@ -4601,7 +4601,7 @@ static int hdlr_fpga_about_fw_ver (const char* data, char* ret) {
 	old_val2 = old_val2 & 0xff;
 
 	//append values
-	old_val = (old_val2 << 32) | old_val1;
+	old_val = ((uint64_t)old_val2 << 32) | (uint64_t)old_val1;
 
 
 	sprintf(ret, "ver. 0x%02x%02x \n", old_val2, old_val1);

server.c

@@ -103,11 +103,16 @@ extern int verbose;
 
 // main loop
 int main(int argc, char *argv[]) {
+
+	int ret = 0;
+	int i = 0;
+	cmd_t cmd;
+
 	verbose = 0;
 	fd_set rfds;
 
 	// check for firmware version
-	for( int i = 1; i < argc; i++ ) {
+	for( i = 1; i < argc; i++ ) {
 		if (strcmp(argv[i], "-v") == 0) {
 			printf("Branch: %s\n", VERSIONGITBRANCH);
 			printf("Revision: %s\n", VERSIONGITREVISION);
@@ -127,10 +132,6 @@ int main(int argc, char *argv[]) {
 		}
 	}
 
-	int ret = 0;
-	int i = 0;
-	cmd_t cmd;
-
 	PRINT( INFO, "Starting Crimson server\n");
 
 	server_init_led();