Fix for issue #50.

Formatting & minor changes.

Author: compuphase

amx/amx.c

@@ -656,7 +656,7 @@ static int VerifyPcode(AMX *amx)
   #if defined AMX_NO_PACKED_OPC
     opmask= ~0;
   #else
-    opmask = (1UL << sizeof(cell)*4)-1;
+    opmask=(1UL << sizeof(cell)*4)-1;
   #endif
 
   /* sanity checks */
@@ -3527,7 +3527,7 @@ int AMXAPI amx_StrLen(const cell *cstr, int *length)
       len=len - len % sizeof(cell);     /* len = multiple of "cell" bytes */
       while ((c & CHARMASK)!=0) {
         len++;
-        c = (ucell)c << 8*sizeof(char);
+        c=(ucell)c << 8*sizeof(char);
       } /* if */
     #endif
   } else {

amx/amx.h

@@ -482,7 +482,6 @@ int AMXAPI amx_Allot(AMX *amx, int cells, cell **address);
 int AMXAPI amx_Callback(AMX *amx, cell index, cell *result, const cell *params);
 int AMXAPI amx_Cleanup(AMX *amx);
 int AMXAPI amx_Clone(AMX *amxClone, AMX *amxSource, void *data);
-int AMXAPI amx_ConsoleInit(AMX *amx);
 int AMXAPI amx_Exec(AMX *amx, cell *retval, int index);
 int AMXAPI amx_FindNative(AMX *amx, const char *name, int *index);
 int AMXAPI amx_FindPublic(AMX *amx, const char *name, int *index);
@@ -515,7 +514,6 @@ int AMXAPI amx_SetCallback(AMX *amx, AMX_CALLBACK callback);
 int AMXAPI amx_SetDebugHook(AMX *amx, AMX_DEBUG debug);
 int AMXAPI amx_SetString(cell *dest, const char *source, int pack, int use_wchar, size_t size);
 int AMXAPI amx_SetUserData(AMX *amx, long tag, void *ptr);
-int AMXAPI amx_StringInit(AMX *amx);
 int AMXAPI amx_StrLen(const cell *cstring, int *length);
 int AMXAPI amx_UTF8Check(const char *string, int *length);
 int AMXAPI amx_UTF8Get(const char *string, const char **endptr, cell *value);

compiler/CMakeLists.txt

@@ -51,7 +51,7 @@ IF(UNIX)
 ENDIF(UNIX)
 
 FILE(READ svnrev.h SVNREV_STR)
-STRING(REGEX REPLACE ".*#define[ \t]+SVN_REV[ \t]+([0-9]+).*" "\\1" PAWNC_REV "${SVNREV_STR}")
+STRING(REGEX REPLACE ".*#define[ \t]+SVNREV_NUM[ \t]+([0-9]+).*" "\\1" PAWNC_REV "${SVNREV_STR}")
 FILE(READ sc1.c SC1_STR)
 STRING(REGEX REPLACE ".*#define[ \t]+VERSION_STR[ \t]+\"([0-9]+).*" "\\1" PAWNC_MAJOR "${SC1_STR}")
 STRING(REGEX REPLACE ".*#define[ \t]+VERSION_STR[ \t]+\"([0-9]+).([0-9]+).*" "\\2" PAWNC_MINOR "${SC1_STR}")
@@ -68,10 +68,10 @@ SET_TARGET_PROPERTIES(pawnc PROPERTIES
 	SOVERSION "${PAWNC_MAJOR}"
 	VERSION "${PAWNC_VER}")
 
-CONFIGURE_FILE(pawnc.pc.in pawnc.pc @ONLY)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pawnc.pc 
-	DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-
+CONFIGURE_FILE(pawnc.pc.in pawnc.pc @ONLY)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pawnc.pc 
+	DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+
 ADD_EXECUTABLE(pawncc ${PAWNCC_SRCS})
 
 # Utility to create GraphViz "dot" files from the XML report (if the report contains states)

compiler/sc1.c

@@ -186,8 +186,6 @@ int main(int argc, char *argv[])
   return pc_compile(argc,argv);
 }
 
-#endif  /* !defined NO_MAIN */
-
 /* pc_printf()
  * Called for general purpose "console" output. This function prints general
  * purpose messages; errors go through pc_error(). The function is modelled
@@ -440,6 +438,9 @@ long pc_lengthbin(void *handle)
   return ftell((FILE*)handle);
 }
 
+#endif  /* !defined NO_MAIN */
+
+
 #if !(defined __MSDOS__ || defined __WIN32__ || defined _Windows)
 int posix_spawnl(char *pgm,...)
 {
@@ -892,7 +893,7 @@ int pc_compile(int argc, char *argv[])
     retcode=jmpcode;
   } /* if */
   #if defined __LINUX__ || defined __FreeBSD__ || defined __OpenBSD__
-  br_deinit();
+    br_deinit();
   #endif
   #if defined FORTIFY
     Fortify_ListAllMemory();

compiler/sc2.c

@@ -1912,7 +1912,9 @@ SC_FUNC void lex_fetchindent(const unsigned char *string,const unsigned char *po
 
   pc_stmtindent=0;
   pc_indentmask=0;
-  for (pc_indentbits=0; pc_indentbits<(int)(pos-string); pc_indentbits++) {
+  if (pos-string>255)
+    return;
+  for (pc_indentbits = 0; pc_indentbits < (unsigned)(pos - string); pc_indentbits++) {
     assert(pc_tabsize>0);
     if (string[pc_indentbits]=='\t') {
       pc_stmtindent += (int)(pc_tabsize - (pc_stmtindent+pc_tabsize) % pc_tabsize);

compiler/sc3.c

@@ -1000,7 +1000,7 @@ static int hier14(value *lval1)
    * negative value would do).
    */
   for (i=0; i<sDIMEN_MAX; i++)
-    arrayidx1[i]=arrayidx2[i]=(cell)((ucell)-1 << (pc_cellsize*8-1));
+    arrayidx1[i]=arrayidx2[i]=(cell)((ucell)~0UL << (pc_cellsize*8-1));
   org_arrayidx=lval1->arrayidx; /* save current pointer, to reset later */
   if (lval1->arrayidx==NULL)
     lval1->arrayidx=arrayidx1;

compiler/scpack.c

@@ -303,7 +303,7 @@ static void write_pairtable(FILE *output, unsigned char pairtable[128][2], char
 
   /* dump the pair table */
   fprintf(output, "/*-*SCPACK start of pair table, do not change or remove this line */\n");
-  fprintf(output, "const unsigned char %s[][2] = {", tablename);
+  fprintf(output, "const unsigned char %s[128][2] = {", tablename);
   for (i=0; i<128 && pairtable[i][0]!=0 && pairtable[i][1]!=0; i++) {
     if ((i % 16)==0)
       fprintf(output, "\n  ");