<framework>

astyle with: --suffix=none --style=allman --indent=tab --indent-cases --indent-namespaces --pad-oper --pad-header --unpad-paren --add-brackets --align-pointer=name --min-conditional-indent=0 --indent-preprocessor --keep-one-line-statements
Warzone2100 · Mar 16, 2015 · f3642db · f3642db
1 parent 0d4deba
commit f3642db
Show file tree

Hide file tree

Showing 40 changed files with 1,334 additions and 844 deletions.
diff --git a/lib/framework/cocoa_wrapper.h b/lib/framework/cocoa_wrapper.h
@@ -37,7 +37,7 @@ void cocoaInit(void);
  * \returns The index of the selected button. (0-indexed from leftmost argument, rightmost displayed button.)
  */
 int cocoaShowAlert(const char *message, const char *information, unsigned style,
-                   const char *buttonTitles, ...) __attribute__ ((sentinel));
+                   const char *buttonTitles, ...) __attribute__((sentinel));
 
 void cocoaSelectFileInFinder(const char *filename);
 void cocoaOpenURL(const char *url);

diff --git a/lib/framework/crc.cpp b/lib/framework/crc.cpp
@@ -33,7 +33,7 @@ uint32_t crcSum(uint32_t crc, const void *data_, size_t dataLen)
 
 	while (dataLen-- > 0)
 	{
-		crc = crc<<8 ^ crcTable[crc>>24 ^ (uint8_t)*data++];
+		crc = crc << 8 ^ crcTable[crc>>24 ^ (uint8_t) * data++];
 	}
 
 	return crc;
@@ -43,8 +43,8 @@ uint32_t crcSumU16(uint32_t crc, const uint16_t *data, size_t dataLen)
 {
 	while (dataLen-- > 0)
 	{
-		crc = crc<<8 ^ crcTable[crc>>24 ^ (uint8_t)(*data>>8)];
-		crc = crc<<8 ^ crcTable[crc>>24 ^ (uint8_t)*data++];
+		crc = crc << 8 ^ crcTable[crc>>24 ^ (uint8_t)(*data >> 8)];
+		crc = crc << 8 ^ crcTable[crc>>24 ^ (uint8_t) * data++];
 	}
 
 	return crc;
@@ -54,14 +54,14 @@ uint32_t crcSumVector2i(uint32_t crc, const Vector2i *data, size_t dataLen)
 {
 	while (dataLen-- > 0)
 	{
-		crc = crc<<8 ^ crcTable[crc>>24 ^ (uint8_t)(data->x>>24)];
-		crc = crc<<8 ^ crcTable[crc>>24 ^ (uint8_t)(data->x>>16)];
-		crc = crc<<8 ^ crcTable[crc>>24 ^ (uint8_t)(data->x>>8)];
-		crc = crc<<8 ^ crcTable[crc>>24 ^ (uint8_t)data->x];
-		crc = crc<<8 ^ crcTable[crc>>24 ^ (uint8_t)(data->y>>24)];
-		crc = crc<<8 ^ crcTable[crc>>24 ^ (uint8_t)(data->y>>16)];
-		crc = crc<<8 ^ crcTable[crc>>24 ^ (uint8_t)(data->y>>8)];
-		crc = crc<<8 ^ crcTable[crc>>24 ^ (uint8_t)data++->y];
+		crc = crc << 8 ^ crcTable[crc>>24 ^ (uint8_t)(data->x >> 24)];
+		crc = crc << 8 ^ crcTable[crc>>24 ^ (uint8_t)(data->x >> 16)];
+		crc = crc << 8 ^ crcTable[crc>>24 ^ (uint8_t)(data->x >> 8)];
+		crc = crc << 8 ^ crcTable[crc>>24 ^ (uint8_t)data->x];
+		crc = crc << 8 ^ crcTable[crc>>24 ^ (uint8_t)(data->y >> 24)];
+		crc = crc << 8 ^ crcTable[crc>>24 ^ (uint8_t)(data->y >> 16)];
+		crc = crc << 8 ^ crcTable[crc>>24 ^ (uint8_t)(data->y >> 8)];
+		crc = crc << 8 ^ crcTable[crc>>24 ^ (uint8_t)data++->y];
 	}
 
 	return crc;
@@ -181,20 +181,20 @@ void Sha256::setZero()
 std::string Sha256::toString() const
 {
 	std::string str;
-	str.resize(Bytes*2);
+	str.resize(Bytes * 2);
 	char const *hexDigits = "0123456789abcdef";
 	for (unsigned n = 0; n < Bytes; ++n)
 	{
-		str[n*2    ] = hexDigits[bytes[n] >> 4];
-		str[n*2 + 1] = hexDigits[bytes[n] & 15];
+		str[n * 2    ] = hexDigits[bytes[n] >> 4];
+		str[n * 2 + 1] = hexDigits[bytes[n] & 15];
 	}
 	return str;
 }
 
 void Sha256::fromString(std::string const &s)
 {
 	setZero();
-	unsigned nChars = std::min<unsigned>(Bytes*2, s.size());
+	unsigned nChars = std::min<unsigned>(Bytes * 2, s.size());
 	for (unsigned n = 0; n < nChars; ++n)
 	{
 		unsigned h;
@@ -215,6 +215,6 @@ void Sha256::fromString(std::string const &s)
 		{
 			break;
 		}
-		bytes[n/2] |= h << (n%2? 0 : 4);
+		bytes[n / 2] |= h << (n % 2 ? 0 : 4);
 	}
 }