update test

Author: Wei Li

proxylab-handout/bytes.c

@@ -67,7 +67,8 @@ void bytes_appendn(Bytes *pstr, const char *buf, size_t buf_len)
 /* return bytes as a cstr */
 void bytes_cstr(Bytes str, char *cstr)
 {
-    for (int i = 0; i < str.len; i++) {
+    int i;
+    for (i = 0; i < str.len; i++) {
         cstr[i] = str.buf[i];
     }
     cstr[str.len] = '\0';

proxylab-handout/cache.c

@@ -27,7 +27,8 @@ static lru_cache_node_t *create_node_from(
     pnode->value = (char *)malloc(value_len*sizeof(char));
     pnode->value_len = value_len;
     strcpy(pnode->key, key);
-    for (int i = 0; i < value_len; i++) {
+    int i;
+    for (i = 0; i < value_len; i++) {
         pnode->value[i] = value[i];
     }
     return pnode;
@@ -86,7 +87,8 @@ static void lru_cache_raise(lru_cache_t *pcache, lru_cache_node_t *cur)
 
 lru_cache_node_t *lru_cache_find(lru_cache_t *pcache, const char *key)
 {
-    for (lru_cache_node_t *cur = pcache->sentinel->next;
+    lru_cache_node_t *cur;
+    for (cur = pcache->sentinel->next;
             cur != pcache->sentinel; cur = cur->next) {
         if (strcasecmp(cur->key, key) == 0) {
             lru_cache_raise(pcache, cur);

proxylab-handout/test.c

@@ -31,9 +31,11 @@ void test_dstring2()
     Bytes str;
     bytes_malloc(&str);
     char fake[2];
+    char c;
+    int i;
     fake[1] = '\0';
-    for (char c = 'a'; c <= 'z'; c+=1) {
-        for (int i = 0; i < 1024; i++) {
+    for (c = 'a'; c <= 'z'; c+=1) {
+        for (i = 0; i < 1024; i++) {
             fake[0] = c;
             bytes_append(&str, fake);
         }
@@ -42,8 +44,8 @@ void test_dstring2()
     CHECK_EQUAL(bytes_size(str), 32*1024);
     CHECK_EQUAL(bytes_ref(str, bytes_length(str)),
             '\0');
-    for (char c = 'a'; c <= 'z'; c+=1) {
-        for (int i = 0; i < 1024; i++) {
+    for (c = 'a'; c <= 'z'; c+=1) {
+        for (i = 0; i < 1024; i++) {
             int idx = (c-'a');
             idx *= 1024;
             idx += i;
@@ -74,7 +76,8 @@ void test_parse_uri()
 
 void print_cache(lru_cache_t *pcache)
 {
-    for (lru_cache_node_t *p = pcache->sentinel->next;
+    lru_cache_node_t *p;
+    for (p = pcache->sentinel->next;
             p != pcache->sentinel; p=p->next) {
         printf("%c ", p->value[0]);
     }
@@ -88,19 +91,25 @@ void test_cache()
     lru_cache_init(&cache, 16);
 
     char str[2];
-    for (char c = 'a'; c < 'a'+16; c += 1) {
+    char c;
+    for (c = 'a'; c < 'a'+16; c += 1) {
         str[0] = c;
         str[1] = '\0';
         lru_cache_insert(&cache, str, str, 1);
+        CHECK_EQUAL(cache.cache_size, c-'a'+1);
+        CHECK_EQUAL(cache.sentinel->next->value[0],
+            str[0]);
     }
     print_cache(&cache);
     // printf("%zu\n", cache.cache_size);
     CHECK_EQUAL(cache.cache_size, 16);
-    str[0] = 'a' + 16;
-    lru_cache_insert(&cache, str, str, 1);
-    CHECK_EQUAL(cache.cache_size, 16);
-    CHECK_EQUAL(cache.sentinel->next->value[0],
-            'a'+16);
+    for (c = 'a'+16; c < 'a'+26; c+=1) {
+      str[0] = c;
+      lru_cache_insert(&cache, str, str, 1);
+      CHECK_EQUAL(cache.cache_size, 16);
+      CHECK_EQUAL(cache.sentinel->next->value[0],
+          str[0]);
+    }
     print_cache(&cache);
     lru_cache_free(&cache);
 }

proxylab-handout/util.c

@@ -49,7 +49,8 @@ size_t copy_until(const char *src, size_t cur, const char *terminators,
 
 void tolowercstr(char *cstr)
 {
-    for (int i = 0; cstr[i] != '\0'; i+=1) {
+    int i;
+    for (i = 0; cstr[i] != '\0'; i+=1) {
         cstr[i] = tolower(cstr[i]);
     }
 }