Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=e86016970f8879383bf77081d182287833b905db

commit e86016970f8879383bf77081d182287833b905db
Author: Michel Hermier <[email protected]>
Date:   Fri Nov 8 15:28:52 2013 +0100

libpacman: Fix indent.

diff --git a/lib/libpacman/be_files.c b/lib/libpacman/be_files.c
index 4d4b1cf..7571c09 100644
--- a/lib/libpacman/be_files.c
+++ b/lib/libpacman/be_files.c
@@ -259,114 +259,114 @@ int _pacman_db_desc_fread(pmpkg_t *info, unsigned int 
inforeq, FILE *fp)
pmlist_t *i;

while(!feof(fp)) {
-                       if(fgets(line, 256, fp) == NULL) {
-                               break;
-                       }
-                       _pacman_strtrim(line);
-                       if(!strcmp(line, "%DESC%")) {
-                               _pacman_db_read_lines(&info->desc_localized, 
line, sline, fp);
-                               STRNCPY(info->desc, 
(char*)info->desc_localized->data, sizeof(info->desc));
-                               for (i = info->desc_localized; i; i = i->next) {
-                                       if (!strncmp(i->data, handle->language, 
strlen(handle->language)) &&
-                                                       
*((char*)i->data+strlen(handle->language)) == ' ') {
-                                               STRNCPY(info->desc, 
(char*)i->data+strlen(handle->language)+1, sizeof(info->desc));
-                                       }
-                               }
-                               _pacman_strtrim(info->desc);
-                       } else if(!strcmp(line, "%GROUPS%")) {
-                               _pacman_db_read_lines(&info->groups, line, 
sline, fp);
-                       } else if(!strcmp(line, "%URL%")) {
-                               if(fgets(info->url, sizeof(info->url), fp) == 
NULL) {
-                                       goto error;
-                               }
-                               _pacman_strtrim(info->url);
-                       } else if(!strcmp(line, "%LICENSE%")) {
-                               _pacman_db_read_lines(&info->license, line, 
sline, fp);
-                       } else if(!strcmp(line, "%ARCH%")) {
-                               if(fgets(info->arch, sizeof(info->arch), fp) == 
NULL) {
-                                       goto error;
-                               }
-                               _pacman_strtrim(info->arch);
-                       } else if(!strcmp(line, "%BUILDDATE%")) {
-                               if(fgets(info->builddate, 
sizeof(info->builddate), fp) == NULL) {
-                                       goto error;
-                               }
-                               _pacman_strtrim(info->builddate);
-                       } else if(!strcmp(line, "%BUILDTYPE%")) {
-                               if(fgets(info->buildtype, 
sizeof(info->buildtype), fp) == NULL) {
-                                       goto error;
-                               }
-                               _pacman_strtrim(info->buildtype);
-                       } else if(!strcmp(line, "%INSTALLDATE%")) {
-                               if(fgets(info->installdate, 
sizeof(info->installdate), fp) == NULL) {
-                                       goto error;
-                               }
-                               _pacman_strtrim(info->installdate);
-                       } else if(!strcmp(line, "%PACKAGER%")) {
-                               if(fgets(info->packager, 
sizeof(info->packager), fp) == NULL) {
-                                       goto error;
-                               }
-                               _pacman_strtrim(info->packager);
-                       } else if(!strcmp(line, "%REASON%")) {
-                               char tmp[32];
-                               if(fgets(tmp, sizeof(tmp), fp) == NULL) {
-                                       goto error;
-                               }
-                               _pacman_strtrim(tmp);
-                               info->reason = atol(tmp);
-                       } else if(!strcmp(line, "%TRIGGERS%")) {
-                               _pacman_db_read_lines(&info->triggers, line, 
sline, fp);
-                       } else if(!strcmp(line, "%SIZE%") || !strcmp(line, 
"%CSIZE%")) {
-                               /* NOTE: the CSIZE and SIZE fields both share 
the "size" field
-                                *       in the pkginfo_t struct.  This can be 
done b/c CSIZE
-                                *       is currently only used in sync 
databases, and SIZE is
-                                *       only used in local databases.
-                                */
-                               char tmp[32];
-                               if(fgets(tmp, sizeof(tmp), fp) == NULL) {
-                                       goto error;
-                               }
-                               _pacman_strtrim(tmp);
-                               info->size = atol(tmp);
-                       } else if(!strcmp(line, "%USIZE%")) {
-                               /* USIZE (uncompressed size) tag only appears 
in sync repositories,
-                                * not the local one. */
-                               char tmp[32];
-                               if(fgets(tmp, sizeof(tmp), fp) == NULL) {
-                                       goto error;
-                               }
-                               _pacman_strtrim(tmp);
-                               info->usize = atol(tmp);
-                       } else if(!strcmp(line, "%SHA1SUM%")) {
-                               /* SHA1SUM tag only appears in sync 
repositories,
-                                * not the local one. */
-                               if(fgets(info->sha1sum, sizeof(info->sha1sum), 
fp) == NULL) {
-                                       goto error;
-                               }
-                       } else if(!strcmp(line, "%MD5SUM%")) {
-                               /* MD5SUM tag only appears in sync repositories,
-                                * not the local one. */
-                               if(fgets(info->md5sum, sizeof(info->md5sum), 
fp) == NULL) {
-                                       goto error;
+               if(fgets(line, 256, fp) == NULL) {
+                       break;
+               }
+               _pacman_strtrim(line);
+               if(!strcmp(line, "%DESC%")) {
+                       _pacman_db_read_lines(&info->desc_localized, line, 
sline, fp);
+                       STRNCPY(info->desc, (char*)info->desc_localized->data, 
sizeof(info->desc));
+                       for (i = info->desc_localized; i; i = i->next) {
+                               if (!strncmp(i->data, handle->language, 
strlen(handle->language)) &&
+                                               
*((char*)i->data+strlen(handle->language)) == ' ') {
+                                       STRNCPY(info->desc, 
(char*)i->data+strlen(handle->language)+1, sizeof(info->desc));
}
-                       /* XXX: these are only here as backwards-compatibility 
for pacman
-                        * sync repos.... in pacman-g2, they have been moved to 
DEPENDS.
-                        * Remove this when we move to pacman-g2 repos.
+                       }
+                       _pacman_strtrim(info->desc);
+               } else if(!strcmp(line, "%GROUPS%")) {
+                       _pacman_db_read_lines(&info->groups, line, sline, fp);
+               } else if(!strcmp(line, "%URL%")) {
+                       if(fgets(info->url, sizeof(info->url), fp) == NULL) {
+                               goto error;
+                       }
+                       _pacman_strtrim(info->url);
+               } else if(!strcmp(line, "%LICENSE%")) {
+                       _pacman_db_read_lines(&info->license, line, sline, fp);
+               } else if(!strcmp(line, "%ARCH%")) {
+                       if(fgets(info->arch, sizeof(info->arch), fp) == NULL) {
+                               goto error;
+                       }
+                       _pacman_strtrim(info->arch);
+               } else if(!strcmp(line, "%BUILDDATE%")) {
+                       if(fgets(info->builddate, sizeof(info->builddate), fp) 
== NULL) {
+                               goto error;
+                       }
+                       _pacman_strtrim(info->builddate);
+               } else if(!strcmp(line, "%BUILDTYPE%")) {
+                       if(fgets(info->buildtype, sizeof(info->buildtype), fp) 
== NULL) {
+                               goto error;
+                       }
+                       _pacman_strtrim(info->buildtype);
+               } else if(!strcmp(line, "%INSTALLDATE%")) {
+                       if(fgets(info->installdate, sizeof(info->installdate), 
fp) == NULL) {
+                               goto error;
+                       }
+                       _pacman_strtrim(info->installdate);
+               } else if(!strcmp(line, "%PACKAGER%")) {
+                       if(fgets(info->packager, sizeof(info->packager), fp) == 
NULL) {
+                               goto error;
+                       }
+                       _pacman_strtrim(info->packager);
+               } else if(!strcmp(line, "%REASON%")) {
+                       char tmp[32];
+                       if(fgets(tmp, sizeof(tmp), fp) == NULL) {
+                               goto error;
+                       }
+                       _pacman_strtrim(tmp);
+                       info->reason = atol(tmp);
+               } else if(!strcmp(line, "%TRIGGERS%")) {
+                       _pacman_db_read_lines(&info->triggers, line, sline, fp);
+               } else if(!strcmp(line, "%SIZE%") || !strcmp(line, "%CSIZE%")) {
+                       /* NOTE: the CSIZE and SIZE fields both share the 
"size" field
+                        *       in the pkginfo_t struct.  This can be done b/c 
CSIZE
+                        *       is currently only used in sync databases, and 
SIZE is
+                        *       only used in local databases.
*/
-                       } else if(!strcmp(line, "%REPLACES%")) {
-                               /* the REPLACES tag is special -- it only 
appears in sync repositories,
-                                * not the local one. */
-                               _pacman_db_read_lines(&info->replaces, line, 
sline, fp);
-                       } else if(!strcmp(line, "%FORCE%")) {
-                               /* FORCE tag only appears in sync repositories,
-                                * not the local one. */
-                               info->force = 1;
-                       } else if(!strcmp(line, "%STICK%")) {
-                               /* STICK tag only appears in sync repositories,
-                                * not the local one. */
-                               info->stick = 1;
+                       char tmp[32];
+                       if(fgets(tmp, sizeof(tmp), fp) == NULL) {
+                               goto error;
+                       }
+                       _pacman_strtrim(tmp);
+                       info->size = atol(tmp);
+               } else if(!strcmp(line, "%USIZE%")) {
+                       /* USIZE (uncompressed size) tag only appears in sync 
repositories,
+                        * not the local one. */
+                       char tmp[32];
+                       if(fgets(tmp, sizeof(tmp), fp) == NULL) {
+                               goto error;
}
+                       _pacman_strtrim(tmp);
+                       info->usize = atol(tmp);
+               } else if(!strcmp(line, "%SHA1SUM%")) {
+                       /* SHA1SUM tag only appears in sync repositories,
+                        * not the local one. */
+                       if(fgets(info->sha1sum, sizeof(info->sha1sum), fp) == 
NULL) {
+                               goto error;
+                       }
+               } else if(!strcmp(line, "%MD5SUM%")) {
+                       /* MD5SUM tag only appears in sync repositories,
+                        * not the local one. */
+                       if(fgets(info->md5sum, sizeof(info->md5sum), fp) == 
NULL) {
+                               goto error;
+                       }
+               /* XXX: these are only here as backwards-compatibility for 
pacman
+                * sync repos.... in pacman-g2, they have been moved to DEPENDS.
+                * Remove this when we move to pacman-g2 repos.
+                */
+               } else if(!strcmp(line, "%REPLACES%")) {
+                       /* the REPLACES tag is special -- it only appears in 
sync repositories,
+                        * not the local one. */
+                       _pacman_db_read_lines(&info->replaces, line, sline, fp);
+               } else if(!strcmp(line, "%FORCE%")) {
+                       /* FORCE tag only appears in sync repositories,
+                        * not the local one. */
+                       info->force = 1;
+               } else if(!strcmp(line, "%STICK%")) {
+                       /* STICK tag only appears in sync repositories,
+                        * not the local one. */
+                       info->stick = 1;
}
+       }
return 0;

error:
@@ -405,32 +405,32 @@ int _pacman_db_depends_fread(pmpkg_t *info, unsigned int 
inforeq, FILE *fp)
int sline = sizeof(line)-1;

while(!feof(fp)) {
-                       if(fgets(line, 256, fp) == NULL) {
-                               break;
-                       }
-                       _pacman_strtrim(line);
-                       if(!strcmp(line, "%DEPENDS%")) {
-                               _pacman_db_read_lines(&info->depends, line, 
sline, fp);
-                       } else if(!strcmp(line, "%REQUIREDBY%")) {
-                               _pacman_db_read_lines(&info->requiredby, line, 
sline, fp);
-                       } else if(!strcmp(line, "%CONFLICTS%")) {
-                               _pacman_db_read_lines(&info->conflicts, line, 
sline, fp);
-                       } else if(!strcmp(line, "%PROVIDES%")) {
-                               _pacman_db_read_lines(&info->provides, line, 
sline, fp);
-                       } else if(!strcmp(line, "%REPLACES%")) {
-                               /* the REPLACES tag is special -- it only 
appears in sync repositories,
-                                * not the local one. */
-                               _pacman_db_read_lines(&info->replaces, line, 
sline, fp);
-                       } else if(!strcmp(line, "%FORCE%")) {
-                               /* FORCE tag only appears in sync repositories,
-                                * not the local one. */
-                               info->force = 1;
-                       } else if(!strcmp(line, "%STICK%")) {
-                               /* STICK tag only appears in sync repositories,
-                                * not the local one. */
-                               info->stick = 1;
-                       }
+               if(fgets(line, 256, fp) == NULL) {
+                       break;
}
+               _pacman_strtrim(line);
+               if(!strcmp(line, "%DEPENDS%")) {
+                       _pacman_db_read_lines(&info->depends, line, sline, fp);
+               } else if(!strcmp(line, "%REQUIREDBY%")) {
+                       _pacman_db_read_lines(&info->requiredby, line, sline, 
fp);
+               } else if(!strcmp(line, "%CONFLICTS%")) {
+                       _pacman_db_read_lines(&info->conflicts, line, sline, 
fp);
+               } else if(!strcmp(line, "%PROVIDES%")) {
+                       _pacman_db_read_lines(&info->provides, line, sline, fp);
+               } else if(!strcmp(line, "%REPLACES%")) {
+                       /* the REPLACES tag is special -- it only appears in 
sync repositories,
+                        * not the local one. */
+                       _pacman_db_read_lines(&info->replaces, line, sline, fp);
+               } else if(!strcmp(line, "%FORCE%")) {
+                       /* FORCE tag only appears in sync repositories,
+                        * not the local one. */
+                       info->force = 1;
+               } else if(!strcmp(line, "%STICK%")) {
+                       /* STICK tag only appears in sync repositories,
+                        * not the local one. */
+                       info->stick = 1;
+               }
+       }
return 0;
}
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to