Changeset 265

Timestamp:

Mar 19, 2004, 9:14:22 AM (22 years ago)

Author:

rhl

Message:

Moved test code to tst_*.c

Location:

trunk/archive/pslib/src/Utils

Files:

• array.c (modified) (1 diff)
• dlist.c (modified) (1 diff)
• hash.c (modified) (1 diff)
• logmsg.c (modified) (1 diff)

trunk/archive/pslib/src/Utils/array.c

@@ -36 +36 @@
     my_psVoidPtrArrayFree(arr);
 }
-
-/*****************************************************************************/
-#if 0                                   // testing
-
-typedef struct {
-    int x, y;
-} psXY;
-
-psXY *psXYAlloc(void)
-{
-    return psAlloc(sizeof(psXY));
-}
-
-void psXYFree(psXY *xy)
-{
-    psFree(xy);
-}
-
-PS_DECLARE_ARRAY_TYPE(psXY);
-PS_CREATE_ARRAY_TYPE(psXY);
-
-PS_DECLARE_ARRAY_PTR_TYPE(psXY);
-PS_CREATE_ARRAY_PTR_TYPE(psXY);
-
-int main(void)
-{
-    psXYArray *t = psXYArrayAlloc(10, 15);
-    psXYPtrArray *pt = psXYPtrArrayAlloc(10, 10);
-
-    for (int i = 0; i < t->n; i++) {
-        t->arr[i].x = i;
-        pt->arr[i]->y = 10*i;
-    }
-
-    t = psXYArrayRealloc(t, 5);
-    t = psXYArrayRealloc(t, 8);
-
-    for (int i = 0; i < t->n; i++) {
-        printf("%d %d  ", t->arr[i].x, pt->arr[i]->y);
-    }
-    printf("\n");
-    
-    psXYArrayFree(t);
-
-    psXY *xy = psMemDecrRefCounter(pt->arr[0]);
-    pt->arr[0] = NULL;
-    psXYFree(xy);    
-    
-    psXYPtrArrayFree(pt);
-
-    psMemCheckLeaks(0, NULL, stderr);
-
-    return 0;
-}
-#endif

trunk/archive/pslib/src/Utils/dlist.c

@@ -342 +342 @@
     return list;
 }
-
-/*****************************************************************************/
-#if 0                                   // testing
-
-typedef struct { int i; } X;
-static X *xAlloc(int i) { X *x = psAlloc(sizeof(X)); x->i = i; return x; }
-static void xFree(X *x) { psFree(x); }
-
-int main(void)
-{
-    psDlist *list = psDlistAlloc(NULL); // list of metadata
-
-    psDlistAppend(list, xAlloc(1));
-    psDlistAppend(list, xAlloc(2));
-    psDlistAppend(list, xAlloc(3));
-    /*
-     * Print that data
-     */
-    for (psDlistElem *ptr = list->head; ptr != NULL; ptr = ptr->next) {
-        printf("%d ", ((X *)(ptr->data))->i);
-    }
-    printf("\n");
-    /*
-     * Print it again
-     */
-    (void)psDlistGet(list, PS_DLIST_TAIL); // initialise iterator
-    X *x = NULL;
-    while ((x = psDlistGet(list, PS_DLIST_PREV)) != NULL) {
-        printf("%d ", x->i);
-    }
-    printf("\n");
-#if 1
-    /*
-     * Convert to an array
-     */
-    psVoidPtrArray *arr = psDlistToArray(list);
-    list = NULL;                        // it's been freed
-
-    for (int i = 0; i < arr->n; i++) {
-        printf("%d ", ((X *)(arr->arr[i]))->i);
-    }
-    printf("\n");
-#if 1
-    /*
-     * Convert back to a list
-     */
-    list = psArrayToDlist(arr);
-    arr = NULL;                         // it's been freed
-
-    (void)psDlistGet(list, PS_DLIST_TAIL); // initialise iterator
-    while ((x = psDlistGet(list, PS_DLIST_PREV)) != NULL) {
-        printf("%d ", x->i);
-    }
-    printf("\n");
-#endif
-    psVoidPtrArrayFree(arr, (void (*)(void *))xFree);
-#endif
-
-#if 1
-    list = psArrayToDlist(psDlistToArray(list));
-
-    (void)psDlistGet(list, PS_DLIST_TAIL); // initialise iterator
-    while ((x = psDlistGet(list, PS_DLIST_PREV)) != NULL) {
-        printf("%d ", x->i);
-    }
-    printf("\n");
-#endif
-    /*
-     * Clean up
-     */
-    psDlistFree(list, (void (*)(void *))xFree);
-    /*
-     * Check for memory leaks
-     */
-    fprintf(stderr,"Checking for memory leaks:\n");
-    psMemCheckLeaks(0, NULL, stderr);
-    
-    return 0;
-}
-#endif

trunk/archive/pslib/src/Utils/hash.c

@@ -224 +224 @@
     return doHashWork(table, key, NULL, 1, NULL);
 }
-
-/*****************************************************************************/
-#if 0                                   // testing
-
-typedef struct { char *name; } ID;
-static ID *IdAlloc(const char *name)
-{
-    ID *id = psAlloc(sizeof(ID));
-    id->name = psStringCopy(name);
-
-    return id;
-}
-
-static void IdFree(ID *id)
-{
-    if (psMemGetRefCounter(id) > 1) {
-        psMemDecrRefCounter(id);
-        return;
-    }
-
-    psFree(id->name);
-    psFree(id);
-}
-
-int main(void)
-{
-    psSetTraceLevel("utils.hash", 3);
-    long memId0 = psMemGetId();
-
-    psHash *hash = psHashAlloc(16);
-
-    psHashInsert(hash, "Lynda", IdAlloc("Lee"), (void (*)(void *))IdFree);
-    psHashInsert(hash, "Lynda", IdAlloc("Lee"), (void (*)(void *))IdFree);
-    psHashInsert(hash, "Robert", IdAlloc("Lupton"), (void (*)(void *))IdFree);
-    psHashInsert(hash, "Robert", IdAlloc("the Good"), (void (*)(void *))IdFree);
-
-    char *names[] = {"Robert", "Lynda", "Rowan", NULL};
-    for (char **name = names; *name != NULL; name++) {
-        ID *id = psHashLookup(hash, *name);
-        printf("%s's surname is:\t%s\n", *name,
-               ((id == NULL) ? "(unknown)" : id->name));
-    }
-
-    psHashFree(hash, (void (*)(void *))IdFree);
-    /*
-     * Check for memory leaks
-     */
-    fprintf(stderr,"Checking for memory leaks:\n");
-    psMemCheckLeaks(memId0, NULL, stderr);
-
-    return 0;
-}
-    
-#endif

trunk/archive/pslib/src/Utils/logmsg.c

@@ -226 +226 @@
     va_end(ap);
 }
-
-/*****************************************************************************/
-#if 0                                   // testing
-
-int main(void)
-{
-    psSetTraceLevel("utils.logMsg", 1);
-    
-    psSetLogDestination(PS_LOG_TO_STDERR);
-    psSetLogLevel(PS_LOG_INFO);
-    psSetLogFormat("NM");
-    
-    psLogMsg("aaa", PS_LOG_INFO, "Hello World\n");
-    psAbort("bbb", "I'm in Hawai`i");
-
-    return 0;
-}
-#endif