Remove warnings c compiler

CMakeLists.txt

@@ -324,15 +324,9 @@ add_compile_options(
     -Wno-pointer-integer-compare
     -Wno-unknown-pragmas
     -Wno-pointer-sign
-<<<<<<< HEAD
-    -Wno-constant-conversion
-    -Wno-tautological-pointer-compare
-=======
->>>>>>> 66015f0470 (Re-enable warnings)
     -Wno-deprecated-declarations
     -Wno-pointer-to-int-cast
     -Wno-compare-distinct-pointer-types
-    -Wno-conditional-type-mismatch
     -Wno-return-type
     -Wno-unused-local-typedef
     -Wno-shift-negative-value

extracted/plugins/FilePlugin/include/common/FilePlugin.h

@@ -53,7 +53,7 @@ squeakFileOffsetType sqFileGetPosition(SQFile *f);
 sqInt   sqFileInit(void);
 sqInt   sqFileShutdown(void);
 sqInt   sqFileOpen(SQFile *f, char *sqFileName, sqInt sqFileNameSize, sqInt writeFlag);
-sqInt   sqFileOpenNew(SQFile *f, char *sqFileName, sqInt sqFileNameSize, sqInt *exists);
+sqInt   sqFileOpenNew(SQFile *f, char *sqFileName, sqInt sqFileNameSize, int *exists);
 sqInt   sqConnectToFileDescriptor(SQFile *f, int fd, sqInt writeFlag);
 sqInt   sqConnectToFile(SQFile *f, void *file, sqInt writeFlag);
 size_t  sqFileReadIntoAt(SQFile *f, size_t count, char *byteArrayIndex, size_t startIndex);

extracted/plugins/FilePlugin/src/common/sqFilePluginBasicPrims.c

@@ -410,7 +410,7 @@ sqFileOpen(SQFile *f, char *sqFileName, sqInt sqFileNameSize, sqInt writeFlag) {
 }
 
 sqInt
-sqFileOpenNew(SQFile *f, char *sqFileName, sqInt sqFileNameSize, sqInt *exists) {
+sqFileOpenNew(SQFile *f, char *sqFileName, sqInt sqFileNameSize, int *exists) {
 	/* Opens the given file for writing and if possible reading
 	   if it does not already exist using the supplied sqFile
 	   structure to record its state.

extracted/plugins/FilePlugin/src/win/sqWin32FilePrims.c

@@ -212,7 +212,7 @@ sqInt sqFileOpen(SQFile *f, char* fileNameIndex, sqInt fileNameSize, sqInt write
   return 1;
 }
 
-sqInt sqFileOpenNew(SQFile *f, char* fileNameIndex, sqInt fileNameSize, sqInt* exists) {
+sqInt sqFileOpenNew(SQFile *f, char* fileNameIndex, sqInt fileNameSize, int* exists) {
   HANDLE h;
   WCHAR *win32Path = NULL;
 

extracted/plugins/SocketPlugin/src/common/SocketPlugin.c

@@ -2306,11 +2306,11 @@ socketRecordSize(void)
 static SocketPtr
 socketValueOf(sqInt socketOop)
 {
-	return ((isBytes(socketOop))
-	 && ((byteSizeOf(socketOop)) == (sizeof(SQSocket)))
-		? ((SocketPtr) (firstIndexableField(socketOop)))
-		: (primitiveFailFor(PrimErrBadArgument),
-			null));
+	if ((isBytes(socketOop)) && ((byteSizeOf(socketOop)) == (sizeof(SQSocket)))) {
+		return (SocketPtr) (firstIndexableField(socketOop));
+	}
+	primitiveFailFor(PrimErrBadArgument);
+	return null;
 }
 
 	/* SmartSyntaxInterpreterPlugin>>#sqAssert: */

smalltalksrc/VMMaker/SocketPlugin.class.st

@@ -1048,8 +1048,9 @@ SocketPlugin >> socketValueOf: socketOop [
 	"Answer a pointer to the first byte of of the socket record within the  
 	 given Smalltalk object, or nil if socketOop is not a socket record."
 	<returnTypeC: #SocketPtr>
-	^((interpreterProxy isBytes: socketOop)
+	((interpreterProxy isBytes: socketOop)
 	   and: [(interpreterProxy byteSizeOf: socketOop) = self socketRecordSize])
-		ifTrue: [self cCoerce: (interpreterProxy firstIndexableField: socketOop) to: #SocketPtr]
-		ifFalse: [interpreterProxy primitiveFailFor: PrimErrBadArgument. nil]
+			ifFalse: [interpreterProxy primitiveFailFor: PrimErrBadArgument. ^ nil].
+
+	^ self cCoerce: (interpreterProxy firstIndexableField: socketOop) to: #SocketPtr
 ]

smalltalksrc/VMMaker/StackInterpreter.class.st

@@ -14736,6 +14736,7 @@ StackInterpreter >> stackPointerIndexForFrame: theFP [
 	<var: #theFP type: #'char *'>
 	<var: #thePage type: #'StackPage *'>
 	<var: #theSP type: #'char *'>
+	<returnTypeC: #sqInt>
 	thePage := stackPages stackPageFor: theFP.
 	theSP := self findSPOf: theFP on: thePage.
 	^self stackPointerIndexForFrame: theFP WithSP: theSP

src/client.c

@@ -32,7 +32,7 @@ void mtfsfi(unsigned long long fpscr)
 #   define mtfsfi(fpscr)
 #endif
 
-static int loadPharoImage(const char* fileName);
+static int loadPharoImage(char* fileName);
 static void* runVMThread(void* p);
 static int runOnMainThread(VMParameters *parameters);
 #ifdef PHARO_VM_IN_WORKER_THREAD
@@ -204,10 +204,8 @@ vm_main(int argc, const char** argv, const char** env)
 }
 
 static int
-loadPharoImage(const char* fileName)
+loadPharoImage(char* fileName)
 {
-    struct stat sb;
-
     /* Check image exists */
     if (!sqImageFileExists(fileName)) {
         logErrorFromErrno("Image file not found");

src/parameters/parameters.m

@@ -122,7 +122,7 @@
 				char* valueString = calloc(1, 255+1);
 
 				CFStringGetCString(value, valueString, 255 + 1, kCFStringEncodingUTF8);
-				vm_parameter_vector_insert_from(&parameters->imageParameters, 1, &valueString);
+				vm_parameter_vector_insert_from(&parameters->imageParameters, 1, (const char**) &valueString);
 			}
 
 		}