testing uncrustify on eet. this shall be standard efl formatting from

now on. you may run indent on code and convert to your own formatting
if you want.. but all code MUST be "uncrustified" before being
cxommitted to svn or before generating patches. time to get the
formatting monster under control.



SVN revision: 50563

1 files changed, 123 insertions, 96 deletions

diff --git a/src/bin/eet_main.c b/src/bin/eet_main.c
index 5964d8a..587146f 100644
--- a/src/bin/eet_main.c
+++ b/src/bin/eet_main.c
@@ -58,20 +58,25 @@ do_eet_list(const char *file)
    if (!ef)
      {
         ERR("cannot open for reading: %s\n", file);
-	exit(-1);
+        exit(-1);
      }
+
    list = eet_list(ef, "*", &num);
    if (list)
      {
-	for (i = 0; i < num; i++)
-	  printf("%s\n",list[i]);
-	free(list);
+        for (i = 0; i < num; i++)
+           printf("%s\n",list[i]);
+        free(list);
      }
+
    eet_close(ef);
 }
 
 static void
-do_eet_extract(const char *file, const char *key, const char *out, const char *crypto_key)
+do_eet_extract(const char *file,
+               const char *key,
+               const char *out,
+               const char *crypto_key)
 {
    Eet_File *ef;
    void *data;
@@ -81,26 +86,30 @@ do_eet_extract(const char *file, const char *key, const char *out, const char *c
    ef = eet_open(file, EET_FILE_MODE_READ);
    if (!ef)
      {
-	ERR("cannot open for reading: %s\n", file);
-	exit(-1);
+        ERR("cannot open for reading: %s\n", file);
+        exit(-1);
      }
+
    data = eet_read_cipher(ef, key, &size, crypto_key);
    if (!data)
      {
-	ERR("cannot read key %s\n", key);
-	exit(-1);
+        ERR("cannot read key %s\n", key);
+        exit(-1);
      }
+
    f = fopen(out, "wb");
    if (!f)
      {
-	ERR("cannot open %s\n", out);
-	exit(-1);
+        ERR("cannot open %s\n", out);
+        exit(-1);
      }
+
    if (fwrite(data, size, 1, f) != 1)
      {
-	ERR("cannot write to %s\n", out);
-	exit(-1);
+        ERR("cannot write to %s\n", out);
+        exit(-1);
      }
+
    fclose(f);
    free(data);
    eet_close(ef);
@@ -113,7 +122,10 @@ do_eet_decode_dump(void *data, const char *str)
 }
 
 static void
-do_eet_decode(const char *file, const char *key, const char *out, const char *crypto_key)
+do_eet_decode(const char *file,
+              const char *key,
+              const char *out,
+              const char *crypto_key)
 {
    Eet_File *ef;
    FILE *f;
@@ -121,26 +133,33 @@ do_eet_decode(const char *file, const char *key, const char *out, const char *cr
    ef = eet_open(file, EET_FILE_MODE_READ);
    if (!ef)
      {
-	ERR("cannot open for reading: %s\n", file);
-	exit(-1);
+        ERR("cannot open for reading: %s\n", file);
+        exit(-1);
      }
+
    f = fopen(out, "wb");
    if (!f)
      {
-	ERR("cannot open %s\n", out);
-	exit(-1);
+        ERR("cannot open %s\n", out);
+        exit(-1);
      }
+
    if (!eet_data_dump_cipher(ef, key, crypto_key, do_eet_decode_dump, f))
      {
-	ERR("cannot write to %s\n", out);
-	exit(-1);
+        ERR("cannot write to %s\n", out);
+        exit(-1);
      }
+
    fclose(f);
    eet_close(ef);
 }
 
 static void
-do_eet_insert(const char *file, const char *key, const char *out, int compress, const char *crypto_key)
+do_eet_insert(const char *file,
+              const char *key,
+              const char *out,
+              int compress,
+              const char *crypto_key)
 {
    Eet_File *ef;
    void *data;
@@ -149,32 +168,37 @@ do_eet_insert(const char *file, const char *key, const char *out, int compress,
 
    ef = eet_open(file, EET_FILE_MODE_READ_WRITE);
    if (!ef)
-     ef = eet_open(file, EET_FILE_MODE_WRITE);
+      ef = eet_open(file, EET_FILE_MODE_WRITE);
+
    if (!ef)
      {
-	ERR("cannot open for read+write: %s\n", file);
-	exit(-1);
+        ERR("cannot open for read+write: %s\n", file);
+        exit(-1);
      }
+
    f = fopen(out, "rb");
    if (!f)
      {
-	ERR("cannot open %s\n", out);
-	exit(-1);
+        ERR("cannot open %s\n", out);
+        exit(-1);
      }
+
    fseek(f, 0, SEEK_END);
    size = ftell(f);
    rewind(f);
    data = malloc(size);
    if (!data)
      {
-	ERR("cannot allocate %i bytes\n", size);
-	exit(-1);
+        ERR("cannot allocate %i bytes\n", size);
+        exit(-1);
      }
+
    if (fread(data, size, 1, f) != 1)
      {
-	ERR("cannot read file %s\n", out);
-	exit(-1);
+        ERR("cannot read file %s\n", out);
+        exit(-1);
      }
+
    fclose(f);
    eet_write_cipher(ef, key, data, size, compress, crypto_key);
    free(data);
@@ -182,7 +206,11 @@ do_eet_insert(const char *file, const char *key, const char *out, int compress,
 }
 
 static void
-do_eet_encode(const char *file, const char *key, const char *out, int compress, const char *crypto_key)
+do_eet_encode(const char *file,
+              const char *key,
+              const char *out,
+              int compress,
+              const char *crypto_key)
 {
    Eet_File *ef;
    char *text;
@@ -192,38 +220,44 @@ do_eet_encode(const char *file, const char *key, const char *out, int compress,
 
    ef = eet_open(file, EET_FILE_MODE_READ_WRITE);
    if (!ef)
-     ef = eet_open(file, EET_FILE_MODE_WRITE);
+      ef = eet_open(file, EET_FILE_MODE_WRITE);
+
    if (!ef)
      {
-	ERR("cannot open for read+write: %s\n", file);
-	exit(-1);
+        ERR("cannot open for read+write: %s\n", file);
+        exit(-1);
      }
+
    f = fopen(out, "rb");
    if (!f)
      {
-	ERR("cannot open %s\n", out);
-	exit(-1);
+        ERR("cannot open %s\n", out);
+        exit(-1);
      }
+
    fseek(f, 0, SEEK_END);
    textlen = ftell(f);
    rewind(f);
    text = malloc(textlen);
    if (!text)
      {
-	ERR("cannot allocate %i bytes\n", size);
-	exit(-1);
+        ERR("cannot allocate %i bytes\n", size);
+        exit(-1);
      }
+
    if (fread(text, textlen, 1, f) != 1)
      {
-	ERR("cannot read file %s\n", out);
-	exit(-1);
+        ERR("cannot read file %s\n", out);
+        exit(-1);
      }
+
    fclose(f);
    if (!eet_data_undump_cipher(ef, key, crypto_key, text, textlen, compress))
      {
         ERR("cannot parse %s\n", out);
-	exit(-1);
+        exit(-1);
      }
+
    free(text);
    eet_close(ef);
 }
@@ -236,9 +270,10 @@ do_eet_remove(const char *file, const char *key)
    ef = eet_open(file, EET_FILE_MODE_READ_WRITE);
    if (!ef)
      {
-	ERR("cannot open for read+write: %s\n", file);
-	exit(-1);
+        ERR("cannot open for read+write: %s\n", file);
+        exit(-1);
      }
+
    eet_delete(ef, key);
    eet_close(ef);
 }
@@ -254,8 +289,8 @@ do_eet_check(const char *file)
    ef = eet_open(file, EET_FILE_MODE_READ);
    if (!ef)
      {
-	ERR("checking signature of `%s` failed\n", file);
-	exit(-1);
+        ERR("checking signature of `%s` failed\n", file);
+        exit(-1);
      }
 
    der = eet_identity_x509(ef, &der_length);
@@ -278,15 +313,15 @@ do_eet_sign(const char *file, const char *private_key, const char *public_key)
    ef = eet_open(file, EET_FILE_MODE_READ_WRITE);
    if (!ef)
      {
-       ERR("cannot open for read+write: %s.\n", file);
-	exit(-1);
+        ERR("cannot open for read+write: %s.\n", file);
+        exit(-1);
      }
 
    key = eet_identity_open(public_key, private_key, NULL);
    if (!key)
      {
-	ERR("cannot open key '%s:%s'.\n", public_key, private_key);
-	exit(-1);
+        ERR("cannot open key '%s:%s'.\n", public_key, private_key);
+        exit(-1);
      }
 
    fprintf(stdout, "Using the following key to sign `%s`.\n", file);
@@ -301,83 +336,75 @@ int
 main(int argc, char **argv)
 {
    if (!eet_init())
-     return -1;
+      return -1;
 
    _eet_main_log_dom = eina_log_domain_register("Eet_Main",EINA_COLOR_CYAN);
    if(_eet_main_log_dom < -1)
      {
-       EINA_LOG_ERR("Impossible to create a log domain for eet_main.\n");
-       eet_shutdown();
-       return(-1);
+        EINA_LOG_ERR("Impossible to create a log domain for eet_main.\n");
+        eet_shutdown();
+        return(-1);
      }
+
    if (argc < 2)
      {
-	help:
-	printf("Usage:\n"
-	       "  eet -l FILE.EET				     list all keys in FILE.EET\n"
-	       "  eet -x FILE.EET KEY OUT-FILE [CRYPTO_KEY]          extract data stored in KEY in FILE.EET and write to OUT-FILE\n"
-	       "  eet -d FILE.EET KEY OUT-FILE [CRYPTO_KEY]          extract and decode data stored in KEY in FILE.EET and write to OUT-FILE\n"
-	       "  eet -i FILE.EET KEY IN-FILE COMPRESS [CRYPTO_KEY]  insert data to KEY in FILE.EET from IN-FILE and if COMPRESS is 1, compress it\n"
-	       "  eet -e FILE.EET KEY IN-FILE COMPRESS [CRYPTO_KEY]  insert and encode to KEY in FILE.EET from IN-FILE and if COMPRESS is 1, compress it\n"
-	       "  eet -r FILE.EET KEY                                remove KEY in FILE.EET\n"
-	       "  eet -c FILE.EET                                    report and check the signature information of an eet file\n"
-	       "  eet -s FILE.EET PRIVATE_KEY PUBLIC_KEY             sign FILE.EET with PRIVATE_KEY and attach PUBLIC_KEY as it's certificate\n"
-	       );
-	eet_shutdown();
-	return -1;
+help:
+        printf(
+           "Usage:\n"
+           "  eet -l FILE.EET				     list all keys in FILE.EET\n"
+           "  eet -x FILE.EET KEY OUT-FILE [CRYPTO_KEY]          extract data stored in KEY in FILE.EET and write to OUT-FILE\n"
+           "  eet -d FILE.EET KEY OUT-FILE [CRYPTO_KEY]          extract and decode data stored in KEY in FILE.EET and write to OUT-FILE\n"
+           "  eet -i FILE.EET KEY IN-FILE COMPRESS [CRYPTO_KEY]  insert data to KEY in FILE.EET from IN-FILE and if COMPRESS is 1, compress it\n"
+           "  eet -e FILE.EET KEY IN-FILE COMPRESS [CRYPTO_KEY]  insert and encode to KEY in FILE.EET from IN-FILE and if COMPRESS is 1, compress it\n"
+           "  eet -r FILE.EET KEY                                remove KEY in FILE.EET\n"
+           "  eet -c FILE.EET                                    report and check the signature information of an eet file\n"
+           "  eet -s FILE.EET PRIVATE_KEY PUBLIC_KEY             sign FILE.EET with PRIVATE_KEY and attach PUBLIC_KEY as it's certificate\n"
+           );
+        eet_shutdown();
+        return -1;
      }
+
    if ((!strncmp(argv[1], "-h", 2)))
-     {
-	goto help;
-     }
+      goto help;
    else if ((!strcmp(argv[1], "-l")) && (argc > 2))
-     {
-	do_eet_list(argv[2]);
-     }
+      do_eet_list(argv[2]);
    else if ((!strcmp(argv[1], "-x")) && (argc > 4))
      {
         if (argc > 5)
-	  do_eet_extract(argv[2], argv[3], argv[4], argv[5]);
-	else
-	  do_eet_extract(argv[2], argv[3], argv[4], NULL);
+           do_eet_extract(argv[2], argv[3], argv[4], argv[5]);
+        else
+           do_eet_extract(argv[2], argv[3], argv[4], NULL);
      }
    else if ((!strcmp(argv[1], "-d")) && (argc > 4))
      {
         if (argc > 5)
-	 do_eet_decode(argv[2], argv[3], argv[4], argv[5]);
-	else
-	 do_eet_decode(argv[2], argv[3], argv[4], NULL);
+           do_eet_decode(argv[2], argv[3], argv[4], argv[5]);
+        else
+           do_eet_decode(argv[2], argv[3], argv[4], NULL);
      }
    else if ((!strcmp(argv[1], "-i")) && (argc > 5))
      {
         if (argc > 6)
-	  do_eet_insert(argv[2], argv[3], argv[4], atoi(argv[5]), argv[6]);
-	else
-	  do_eet_insert(argv[2], argv[3], argv[4], atoi(argv[5]), NULL);
+           do_eet_insert(argv[2], argv[3], argv[4], atoi(argv[5]), argv[6]);
+        else
+           do_eet_insert(argv[2], argv[3], argv[4], atoi(argv[5]), NULL);
      }
    else if ((!strcmp(argv[1], "-e")) && (argc > 5))
      {
         if (argc > 6)
-	  do_eet_encode(argv[2], argv[3], argv[4], atoi(argv[5]), argv[6]);
-	else
-	  do_eet_encode(argv[2], argv[3], argv[4], atoi(argv[5]), NULL);
+           do_eet_encode(argv[2], argv[3], argv[4], atoi(argv[5]), argv[6]);
+        else
+           do_eet_encode(argv[2], argv[3], argv[4], atoi(argv[5]), NULL);
      }
    else if ((!strcmp(argv[1], "-r")) && (argc > 3))
-     {
-	do_eet_remove(argv[2], argv[3]);
-     }
+           do_eet_remove(argv[2], argv[3]);
    else if ((!strcmp(argv[1], "-c")) && (argc > 2))
-     {
-	do_eet_check(argv[2]);
-     }
+      do_eet_check(argv[2]);
    else if ((!strcmp(argv[1], "-s")) && (argc > 4))
-     {
-	do_eet_sign(argv[2], argv[3], argv[4]);
-     }
+      do_eet_sign(argv[2], argv[3], argv[4]);
    else
-     {
-	goto help;
-     }
+      goto help;
+
    eina_log_domain_unregister(_eet_main_log_dom);
    eet_shutdown();
    return 0;