* More optimizations

svn: 1221

src/compat/inet_ntop.c

@@ -124,7 +124,7 @@ egg_inet_ntop6(src, dst, size)
 	 */
 	egg_memset(words, '\0', sizeof words);
 	for (i = 0; i < NS_IN6ADDRSZ; i += 2)
-		words[i / 2] = (src[i] << 8) | src[i + 1];
+		words[i >> 1] = (src[i] << 8) | src[i + 1];
 	best.base = -1;
 	cur.base = -1;
 	for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {

src/crypt.c

@@ -16,7 +16,7 @@
 
 #define CRYPT_BLOCKSIZE AES_BLOCK_SIZE
 #define CRYPT_KEYBITS 256
-#define CRYPT_KEYSIZE (CRYPT_KEYBITS / 8)
+#define CRYPT_KEYSIZE (CRYPT_KEYBITS >> 3)
 
 AES_KEY e_key, d_key;
 

src/crypt.h

@@ -9,8 +9,8 @@
 
 #include "src/crypto/crypto.h"
 
-#define SHA_HASH_LENGTH (SHA_DIGEST_LENGTH * 2)
-#define MD5_HASH_LENGTH (MD5_DIGEST_LENGTH * 2)
+#define SHA_HASH_LENGTH (SHA_DIGEST_LENGTH << 1)
+#define MD5_HASH_LENGTH (MD5_DIGEST_LENGTH << 1)
 #define md5cmp(hash, string)            strcmp(hash, MD5(string))
 
 char *MD5(const char *);

src/eggdrop.h

@@ -45,7 +45,7 @@
 #define NICKLEN         NICKMAX + 1
 #define UHOSTLEN        UHOSTMAX + 1
 #define DIRLEN          DIRMAX + 1
-#define NOTENAMELEN     ((HANDLEN * 2) + 1)
+#define NOTENAMELEN     ((HANDLEN << 1) + 1)
 #define BADNICKCHARS	"-,+*=:!.@#;$%&"
 
 #if (NICKMAX < 9) || (NICKMAX > 32)

src/misc.c

@@ -545,7 +545,7 @@ char *str_escape(const char *str, const char divc, const char mask)
   for (s = str; *s; s++) {
     /* Resize buffer. */
     if ((buflen - blen) <= 3) {
-      buflen = (buflen * 2);
+      buflen <<= 1;		/* * 2 */
       buf = realloc(buf, buflen + 1);
       if (!buf)
 	return NULL;

src/net.c

@@ -1173,10 +1173,10 @@ char *botlink_decrypt(int snum, char *src)
   strcpy(src, line);
   free(line);
   if (socklist[snum].iseed) {
-    *(dword *) & socklist[snum].ikey[0 * 4] = prand(&socklist[snum].iseed, 0xFFFFFFFF);
-    *(dword *) & socklist[snum].ikey[1 * 4] = prand(&socklist[snum].iseed, 0xFFFFFFFF);
-    *(dword *) & socklist[snum].ikey[2 * 4] = prand(&socklist[snum].iseed, 0xFFFFFFFF);
-    *(dword *) & socklist[snum].ikey[3 * 4] = prand(&socklist[snum].iseed, 0xFFFFFFFF);
+    *(dword *) & socklist[snum].ikey[0] = prand(&socklist[snum].iseed, 0xFFFFFFFF);
+    *(dword *) & socklist[snum].ikey[4] = prand(&socklist[snum].iseed, 0xFFFFFFFF);
+    *(dword *) & socklist[snum].ikey[8] = prand(&socklist[snum].iseed, 0xFFFFFFFF);
+    *(dword *) & socklist[snum].ikey[12] = prand(&socklist[snum].iseed, 0xFFFFFFFF);
 
     if (!socklist[snum].iseed)
       socklist[snum].iseed++;
@@ -1201,10 +1201,10 @@ char *botlink_encrypt(int snum, char *src, size_t *len)
     *eol++ = 0;
     eline = encrypt_string(socklist[snum].okey, line);
     if (socklist[snum].oseed) {
-      *(dword *) & socklist[snum].okey[0 * 4] = prand(&socklist[snum].oseed, 0xFFFFFFFF);
-      *(dword *) & socklist[snum].okey[1 * 4] = prand(&socklist[snum].oseed, 0xFFFFFFFF);
-      *(dword *) & socklist[snum].okey[2 * 4] = prand(&socklist[snum].oseed, 0xFFFFFFFF);
-      *(dword *) & socklist[snum].okey[3 * 4] = prand(&socklist[snum].oseed, 0xFFFFFFFF);
+      *(dword *) & socklist[snum].okey[0] = prand(&socklist[snum].oseed, 0xFFFFFFFF);
+      *(dword *) & socklist[snum].okey[4] = prand(&socklist[snum].oseed, 0xFFFFFFFF);
+      *(dword *) & socklist[snum].okey[8] = prand(&socklist[snum].oseed, 0xFFFFFFFF);
+      *(dword *) & socklist[snum].okey[12] = prand(&socklist[snum].oseed, 0xFFFFFFFF);
 
       if (!socklist[snum].oseed)
         socklist[snum].oseed++;
@@ -1220,10 +1220,10 @@ char *botlink_encrypt(int snum, char *src, size_t *len)
   if (line[0]) {
     eline = encrypt_string(socklist[snum].okey, line);
     if (socklist[snum].oseed) {
-      *(dword *) & socklist[snum].okey[0 * 4] = prand(&socklist[snum].oseed, 0xFFFFFFFF);
-      *(dword *) & socklist[snum].okey[1 * 4] = prand(&socklist[snum].oseed, 0xFFFFFFFF);
-      *(dword *) & socklist[snum].okey[2 * 4] = prand(&socklist[snum].oseed, 0xFFFFFFFF);
-      *(dword *) & socklist[snum].okey[3 * 4] = prand(&socklist[snum].oseed, 0xFFFFFFFF);
+      *(dword *) & socklist[snum].okey[0] = prand(&socklist[snum].oseed, 0xFFFFFFFF);
+      *(dword *) & socklist[snum].okey[4] = prand(&socklist[snum].oseed, 0xFFFFFFFF);
+      *(dword *) & socklist[snum].okey[8] = prand(&socklist[snum].oseed, 0xFFFFFFFF);
+      *(dword *) & socklist[snum].okey[12] = prand(&socklist[snum].oseed, 0xFFFFFFFF);
 
       if (!socklist[snum].oseed)
         socklist[snum].oseed++;