Move bnet_despool() into class in bsock.c

[bacula/bacula] / bacula / src / lib / sha1.c

diff --git a/bacula/src/lib/sha1.c b/bacula/src/lib/sha1.c
index 1d4ed9c95d7de0aa09bc0540f38e6e7b8e1821d7..063fad0e9436f5c18fc843dbc28668ed11045595 100644 (file)
--- a/bacula/src/lib/sha1.c
+++ b/bacula/src/lib/sha1.c
@@ -424,14 +424,14 @@ int main()
      * Perform SHA-1 tests
      */
     for(j = 0; j < 4; ++j) {
-        printf( "\nTest %d: %d, '%s'\n",
+       printf( "\nTest %d: %d, '%s'\n",
                j+1,
                repeatcount[j],
                testarray[j]);
 
        err = SHA1Init(&sha);
        if (err) {
-            fprintf(stderr, "SHA1Reset Error %d.\n", err );
+           fprintf(stderr, "SHA1Reset Error %d.\n", err );
            break;    /* out of for j loop */
        }
 
@@ -441,7 +441,7 @@ int main()
                  (const unsigned char *) testarray[j],
                  strlen(testarray[j]));
            if (err) {
-                fprintf(stderr, "SHA1Input Error %d.\n", err );
+               fprintf(stderr, "SHA1Input Error %d.\n", err );
                break;    /* out of for i loop */
            }
        }
@@ -449,19 +449,19 @@ int main()
        err = SHA1Final(&sha, Message_Digest);
        if (err) {
            fprintf(stderr,
-            "SHA1Result Error %d, could not compute message digest.\n",
+           "SHA1Result Error %d, could not compute message digest.\n",
            err );
        }
        else
        {
-            printf("\t");
+           printf("\t");
            for(i = 0; i < 20 ; ++i) {
-                printf("%02X ", Message_Digest[i]);
+               printf("%02X ", Message_Digest[i]);
            }
-            printf("\n");
+           printf("\n");
        }
-        printf("Should match:\n");
-        printf("\t%s\n", resultarray[j]);
+       printf("Should match:\n");
+       printf("\t%s\n", resultarray[j]);
     }
 
     /* Test some error returns */
@@ -479,7 +479,7 @@ int main()
  * Reads a single ASCII file and prints the HEX sha1 sum.
  */
 #include <stdio.h>
-int main(int argc, char *argv[]) 
+int main(int argc, char *argv[])
 {
    FILE *fd;
    SHA1Context ctx;
@@ -490,7 +490,7 @@ int main(int argc, char *argv[])
       printf("Must have filename\n");
       exit(1);
    }
-   fd = fopen(argv[1], "r");
+   fd = fopen(argv[1], "rb");
    if (!fd) {
       printf("Could not open %s: ERR=%s\n", argv[1], strerror(errno));
       exit(1);