From 2322909703eb2f30ac0ef7273420f13c5f61410b Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 16 Nov 2007 20:18:45 -0600 Subject: War on whitespace Run the kernel's cleanfile script on all of our source files. Signed-off-by: Dan McGee --- lib/libalpm/add.c | 8 ++++---- lib/libalpm/add.h | 6 +++--- lib/libalpm/alpm.c | 6 +++--- lib/libalpm/alpm.h | 8 ++++---- lib/libalpm/alpm_list.c | 18 +++++++++--------- lib/libalpm/alpm_list.h | 6 +++--- lib/libalpm/backup.c | 8 ++++---- lib/libalpm/backup.h | 6 +++--- lib/libalpm/be_files.c | 10 +++++----- lib/libalpm/cache.c | 6 +++--- lib/libalpm/cache.h | 6 +++--- lib/libalpm/conflict.c | 6 +++--- lib/libalpm/conflict.h | 6 +++--- lib/libalpm/db.c | 8 ++++---- lib/libalpm/db.h | 6 +++--- lib/libalpm/delta.c | 4 ++-- lib/libalpm/delta.h | 6 +++--- lib/libalpm/deps.c | 22 +++++++++++----------- lib/libalpm/deps.h | 6 +++--- lib/libalpm/error.c | 6 +++--- lib/libalpm/error.h | 6 +++--- lib/libalpm/group.h | 6 +++--- lib/libalpm/handle.c | 6 +++--- lib/libalpm/handle.h | 10 +++++----- lib/libalpm/log.c | 6 +++--- lib/libalpm/log.h | 6 +++--- lib/libalpm/md5.c | 1 - lib/libalpm/package.c | 10 +++++----- lib/libalpm/package.h | 6 +++--- lib/libalpm/provide.c | 6 +++--- lib/libalpm/provide.h | 6 +++--- lib/libalpm/remove.c | 14 +++++++------- lib/libalpm/remove.h | 6 +++--- lib/libalpm/server.c | 18 +++++++++--------- lib/libalpm/server.h | 6 +++--- lib/libalpm/sync.c | 10 +++++----- lib/libalpm/sync.h | 6 +++--- lib/libalpm/trans.c | 4 ++-- lib/libalpm/trans.h | 6 +++--- lib/libalpm/util.c | 8 ++++---- lib/libalpm/util.h | 6 +++--- 41 files changed, 155 insertions(+), 156 deletions(-) (limited to 'lib') diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index d242134a..adfa8f0c 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -1,8 +1,8 @@ /* * add.c - * + * * Copyright (c) 2002-2007 by Judd Vinet - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ @@ -169,7 +169,7 @@ int _alpm_add_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data) _alpm_log(PM_LOG_ERROR, _("replacing packages with -A and -U is not supported yet\n")); _alpm_log(PM_LOG_ERROR, _("please remove '%s' first, using -Rd\n"), miss->depend.name); RET_ERR(PM_ERR_CONFLICTING_DEPS, -1); - + /* Attempt to resolve conflicts */ /* int skip_this = 0; diff --git a/lib/libalpm/add.h b/lib/libalpm/add.h index 4cd2e445..e576c075 100644 --- a/lib/libalpm/add.h +++ b/lib/libalpm/add.h @@ -1,8 +1,8 @@ /* * add.h - * + * * Copyright (c) 2002-2006 by Judd Vinet - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ #ifndef _ALPM_ADD_H diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 9fe9bc17..62bb8316 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -1,11 +1,11 @@ /* * alpm.c - * + * * Copyright (c) 2002-2007 by Judd Vinet * Copyright (c) 2005 by Aurelien Foret * Copyright (c) 2005 by Christian Hamar * Copyright (c) 2005, 2006 by Miklos Vajna - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index ffcd3870..e8726bcc 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1,11 +1,11 @@ /* * alpm.h - * + * * Copyright (c) 2002-2006 by Judd Vinet * Copyright (c) 2005 by Aurelien Foret * Copyright (c) 2005 by Christian Hamar * Copyright (c) 2005, 2006 by Miklos Vajna - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ #ifndef _ALPM_H @@ -39,7 +39,7 @@ extern "C" { * Arch Linux Package Management library */ -/* +/* * Structures */ diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index c1e4cb8e..070101de 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -1,8 +1,8 @@ /* * alpm_list.c - * + * * Copyright (c) 2002-2006 by Judd Vinet - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ @@ -179,7 +179,7 @@ alpm_list_t SYMEXPORT *alpm_list_add_sorted(alpm_list_t *list, void *data, alpm_ /* At end, adjust tail pointer on head node */ list->prev = add; } - + return(list); } } @@ -197,7 +197,7 @@ alpm_list_t SYMEXPORT *alpm_list_mmerge(alpm_list_t *left, alpm_list_t *right, a { alpm_list_t *newlist, *lp; - if (left == NULL) + if (left == NULL) return right; if (right == NULL) return left; @@ -219,7 +219,7 @@ alpm_list_t SYMEXPORT *alpm_list_mmerge(alpm_list_t *left, alpm_list_t *right, a lp->next = left; left->prev = lp; left = left->next; - } + } else { lp->next = right; right->prev = lp; @@ -264,7 +264,7 @@ alpm_list_t SYMEXPORT *alpm_list_msort(alpm_list_t *list, int n, alpm_list_fn_cm alpm_list_t *lastleft = alpm_list_nth(list, n/2 - 1); alpm_list_t *right = lastleft->next; /* terminate first list */ - lastleft->next = NULL; + lastleft->next = NULL; left = alpm_list_msort(left, n/2, fn); right = alpm_list_msort(right, n - (n/2), fn); @@ -363,7 +363,7 @@ alpm_list_t SYMEXPORT *alpm_list_remove_dupes(const alpm_list_t *list) /** * @brief Copy a string list, including data. - * + * * @param list the list to copy * * @return a copy of the original list @@ -542,7 +542,7 @@ int SYMEXPORT alpm_list_count(const alpm_list_t *list) /** * @brief Find an item in a list. - * + * * Search for the item whos data matches that of the `needle`. * * @param needle the data to search for (== comparison) diff --git a/lib/libalpm/alpm_list.h b/lib/libalpm/alpm_list.h index b364670e..d6e9882b 100644 --- a/lib/libalpm/alpm_list.h +++ b/lib/libalpm/alpm_list.h @@ -1,8 +1,8 @@ /* * alpm_list.h - * + * * Copyright (c) 2002-2006 by Judd Vinet - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ #ifndef _ALPM_LIST_H diff --git a/lib/libalpm/backup.c b/lib/libalpm/backup.c index 9cdb7940..731a59e6 100644 --- a/lib/libalpm/backup.c +++ b/lib/libalpm/backup.c @@ -1,11 +1,11 @@ /* * backup.c - * + * * Copyright (c) 2005 by Judd Vinet * Copyright (c) 2005 by Aurelien Foret * Copyright (c) 2005 by Christian Hamar * Copyright (c) 2006 by Miklos Vajna - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ @@ -50,7 +50,7 @@ char *_alpm_needbackup(const char *file, const alpm_list_t *backup) for(lp = backup; lp; lp = lp->next) { char *str = strdup(lp->data); char *ptr; - + /* tab delimiter */ ptr = strchr(str, '\t'); if(ptr == NULL) { diff --git a/lib/libalpm/backup.h b/lib/libalpm/backup.h index 6df8e251..8723abaf 100644 --- a/lib/libalpm/backup.h +++ b/lib/libalpm/backup.h @@ -1,8 +1,8 @@ /* * backup.h - * + * * Copyright (c) 2002-2006 by Judd Vinet - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ #ifndef _ALPM_BACKUP_H diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index c182e778..61c0c0e0 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -1,9 +1,9 @@ /* * be_files.c - * + * * Copyright (c) 2006 by Christian Hamar * Copyright (c) 2006 by Miklos Vajna - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ @@ -54,7 +54,7 @@ int _alpm_db_install(pmdb_t *db, const char *dbfile) { ALPM_LOG_FUNC; - /* TODO we should not simply unpack the archive, but better parse it and + /* TODO we should not simply unpack the archive, but better parse it and * db_write each entry (see sync_load_dbarchive to get archive content) */ _alpm_log(PM_LOG_DEBUG, "unpacking database '%s'\n", dbfile); @@ -479,7 +479,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) * not the local one. * while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { info->replaces = alpm_list_add(info->replaces, strdup(line)); - } + } } else if(!strcmp(line, "%FORCE%")) { * FORCE tag only appears in sync repositories, * not the local one. * diff --git a/lib/libalpm/cache.c b/lib/libalpm/cache.c index ef3c71bd..1da65a49 100644 --- a/lib/libalpm/cache.c +++ b/lib/libalpm/cache.c @@ -1,8 +1,8 @@ /* * cache.c - * + * * Copyright (c) 2002-2006 by Judd Vinet - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ diff --git a/lib/libalpm/cache.h b/lib/libalpm/cache.h index fa1fef32..2526afac 100644 --- a/lib/libalpm/cache.h +++ b/lib/libalpm/cache.h @@ -1,8 +1,8 @@ /* * cache.h - * + * * Copyright (c) 2002-2006 by Judd Vinet - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ #ifndef _ALPM_CACHE_H diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 6de20768..754d5a91 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -1,12 +1,12 @@ /* * conflict.c - * + * * Copyright (c) 2002-2006 by Judd Vinet * Copyright (c) 2005 by Aurelien Foret * Copyright (c) 2006 by David Kimpe * Copyright (c) 2006 by Miklos Vajna * Copyright (c) 2006 by Christian Hamar - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ diff --git a/lib/libalpm/conflict.h b/lib/libalpm/conflict.h index 8928de86..c4f1d600 100644 --- a/lib/libalpm/conflict.h +++ b/lib/libalpm/conflict.h @@ -1,8 +1,8 @@ /* * conflict.h - * + * * Copyright (c) 2002-2006 by Judd Vinet - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ #ifndef _ALPM_CONFLICT_H diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 8e4f3fa4..d02ef144 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -1,12 +1,12 @@ /* * db.c - * + * * Copyright (c) 2002-2006 by Judd Vinet * Copyright (c) 2005 by Aurelien Foret * Copyright (c) 2005 by Christian Hamar * Copyright (c) 2006 by David Kimpe * Copyright (c) 2005, 2006 by Miklos Vajna - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ @@ -635,7 +635,7 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles) } targ = i->data; _alpm_log(PM_LOG_DEBUG, "searching for target '%s'\n", targ); - + if(regcomp(®, targ, REG_EXTENDED | REG_NOSUB | REG_ICASE | REG_NEWLINE) != 0) { RET_ERR(PM_ERR_INVALID_REGEX, NULL); } diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index 2549cdc8..4c559866 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -1,10 +1,10 @@ /* * db.h - * + * * Copyright (c) 2002-2006 by Judd Vinet * Copyright (c) 2005 by Aurelien Foret * Copyright (c) 2006 by Miklos Vajna - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ #ifndef _ALPM_DB_H diff --git a/lib/libalpm/delta.c b/lib/libalpm/delta.c index 0e9dcc39..dfe4a946 100644 --- a/lib/libalpm/delta.c +++ b/lib/libalpm/delta.c @@ -2,7 +2,7 @@ * delta.c * * Copyright (c) 2007 by Judd Vinet - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ diff --git a/lib/libalpm/delta.h b/lib/libalpm/delta.h index 67dbeb47..d2dd361f 100644 --- a/lib/libalpm/delta.h +++ b/lib/libalpm/delta.h @@ -1,8 +1,8 @@ /* * delta.h - * + * * Copyright (c) 2007 by Judd Vinet - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ #ifndef _ALPM_DELTA_H diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index e35838ac..aed8b253 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -1,10 +1,10 @@ /* * deps.c - * + * * Copyright (c) 2002-2006 by Judd Vinet * Copyright (c) 2005 by Aurelien Foret * Copyright (c) 2005, 2006 by Miklos Vajna - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ @@ -152,13 +152,13 @@ static alpm_list_t *_alpm_graph_init(alpm_list_t *targets) * Target order is A,B,C,D * * Should be re-ordered to C,A,B,D - * + * * mode should be either PM_TRANS_TYPE_ADD or PM_TRANS_TYPE_REMOVE. This * affects the dependency order sortbydeps() will use. * * This function returns the new alpm_list_t* target list. * - */ + */ alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, pmtranstype_t mode) { alpm_list_t *newtargs = NULL; @@ -356,11 +356,11 @@ alpm_list_t *_alpm_checkdeps(pmdb_t *db, pmtranstype_t op, for(j = alpm_pkg_get_depends(tp); j; j = j->next) { pmdepend_t *depend = j->data; - + found = 0; - /* check other targets */ - for(k = packages; k && !found; k = k->next) { - pmpkg_t *p = k->data; + /* check other targets */ + for(k = packages; k && !found; k = k->next) { + pmpkg_t *p = k->data; found = alpm_depcmp(p, depend); } @@ -514,7 +514,7 @@ pmdepend_t SYMEXPORT *alpm_splitdep(const char *depstring) return(NULL); } newstr = strdup(depstring); - + MALLOC(depend, sizeof(pmdepend_t), return(NULL)); /* Find a version comparator if one exists. If it does, set the type and @@ -746,7 +746,7 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *syncpkg, goto error; } } - + _alpm_log(PM_LOG_DEBUG, "finished resolving dependencies\n"); FREELIST(deps); diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h index f11a8d88..1d656910 100644 --- a/lib/libalpm/deps.h +++ b/lib/libalpm/deps.h @@ -1,10 +1,10 @@ /* * deps.h - * + * * Copyright (c) 2002-2006 by Judd Vinet * Copyright (c) 2005 by Aurelien Foret * Copyright (c) 2006 by Miklos Vajna - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ #ifndef _ALPM_DEPS_H diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index 44d1c60e..9ced6775 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -1,11 +1,11 @@ /* * error.c - * + * * Copyright (c) 2002-2006 by Judd Vinet * Copyright (c) 2005 by Aurelien Foret * Copyright (c) 2005 by Christian Hamar * Copyright (c) 2006 by Miklos Vajna - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ diff --git a/lib/libalpm/error.h b/lib/libalpm/error.h index 8e9e7c80..7692a944 100644 --- a/lib/libalpm/error.h +++ b/lib/libalpm/error.h @@ -1,8 +1,8 @@ /* * error.h - * + * * Copyright (c) 2002-2006 by Judd Vinet - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ #ifndef _ALPM_ERROR_H diff --git a/lib/libalpm/group.h b/lib/libalpm/group.h index 7f679b55..477e701c 100644 --- a/lib/libalpm/group.h +++ b/lib/libalpm/group.h @@ -1,8 +1,8 @@ /* * group.h - * + * * Copyright (c) 2002-2006 by Judd Vinet - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ #ifndef _ALPM_GROUP_H diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 78ac1171..755eefb3 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -1,10 +1,10 @@ /* * handle.c - * + * * Copyright (c) 2002-2006 by Judd Vinet * Copyright (c) 2005 by Aurelien Foret * Copyright (c) 2005, 2006 by Miklos Vajna - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 63a46884..fb3ced3c 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -1,8 +1,8 @@ /* * handle.h - * + * * Copyright (c) 2002-2006 by Judd Vinet - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -15,13 +15,13 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ #ifndef _ALPM_HANDLE_H #define _ALPM_HANDLE_H -#include +#include #include #include "alpm_list.h" @@ -38,7 +38,7 @@ typedef struct _pmhandle_t { FILE *logstream; /* log file stream pointer */ int lckfd; /* lock file descriptor if one exists */ pmtrans_t *trans; - + /* callback functions */ alpm_cb_log logcb; /* Log callback function */ alpm_cb_download dlcb; /* Download callback function */ diff --git a/lib/libalpm/log.c b/lib/libalpm/log.c index dd9540ed..f666a099 100644 --- a/lib/libalpm/log.c +++ b/lib/libalpm/log.c @@ -1,8 +1,8 @@ /* * log.c - * + * * Copyright (c) 2002-2006 by Judd Vinet - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ diff --git a/lib/libalpm/log.h b/lib/libalpm/log.h index 00fabf47..00bb8152 100644 --- a/lib/libalpm/log.h +++ b/lib/libalpm/log.h @@ -1,8 +1,8 @@ /* * log.h - * + * * Copyright (c) 2002-2006 by Judd Vinet - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ #ifndef _ALPM_LOG_H diff --git a/lib/libalpm/md5.c b/lib/libalpm/md5.c index 10eec0d2..2d111c9d 100644 --- a/lib/libalpm/md5.c +++ b/lib/libalpm/md5.c @@ -333,4 +333,3 @@ int md5_file( const char *path, unsigned char *output ) fclose( f ); return( 0 ); } - diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index d9927668..75dabd84 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -5,7 +5,7 @@ * Copyright (c) 2005 by Aurelien Foret * Copyright (c) 2005, 2006 by Christian Hamar * Copyright (c) 2005, 2006 by Miklos Vajna - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ @@ -773,7 +773,7 @@ int _alpm_pkg_cmp(const void *p1, const void *p2) { pmpkg_t *pk1 = (pmpkg_t *)p1; pmpkg_t *pk2 = (pmpkg_t *)p2; - + return(strcmp(alpm_pkg_get_name(pk1), alpm_pkg_get_name(pk2))); } @@ -963,7 +963,7 @@ pmpkg_t *_alpm_pkg_load(const char *pkgfile, unsigned short full) char *fn; char str[PATH_MAX+1]; int fd; - + fn = strdup("/tmp/alpm_XXXXXX"); fd = mkstemp(fn); archive_read_data_into_fd(archive,fd); @@ -1015,7 +1015,7 @@ pmpkg_t *_alpm_pkg_load(const char *pkgfile, unsigned short full) _alpm_log(PM_LOG_ERROR, _("missing package metadata in %s\n"), pkgfile); goto error; } - + archive_read_finish(archive); if(!filelist) { diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index b125e06c..5e06785e 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -1,12 +1,12 @@ /* * package.h - * + * * Copyright (c) 2002-2006 by Judd Vinet * Copyright (c) 2005 by Aurelien Foret * Copyright (c) 2006 by David Kimpe * Copyright (c) 2005, 2006 by Christian Hamar * Copyright (c) 2005, 2006 by Miklos Vajna - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ #ifndef _ALPM_PACKAGE_H diff --git a/lib/libalpm/provide.c b/lib/libalpm/provide.c index df600be7..a580ec54 100644 --- a/lib/libalpm/provide.c +++ b/lib/libalpm/provide.c @@ -1,8 +1,8 @@ /* * provide.c - * + * * Copyright (c) 2002-2006 by Judd Vinet - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ diff --git a/lib/libalpm/provide.h b/lib/libalpm/provide.h index b5c55db3..3142ff12 100644 --- a/lib/libalpm/provide.h +++ b/lib/libalpm/provide.h @@ -1,8 +1,8 @@ /* * provide.h - * + * * Copyright (c) 2002-2006 by Judd Vinet - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ #ifndef _ALPM_PROVIDE_H diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 66a1527c..50763578 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -1,12 +1,12 @@ /* * remove.c - * + * * Copyright (c) 2002-2006 by Judd Vinet * Copyright (c) 2005 by Aurelien Foret * Copyright (c) 2005 by Christian Hamar * Copyright (c) 2006 by David Kimpe * Copyright (c) 2005, 2006 by Miklos Vajna - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ @@ -137,7 +137,7 @@ int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data) } } - /* re-order w.r.t. dependencies */ + /* re-order w.r.t. dependencies */ _alpm_log(PM_LOG_DEBUG, "sorting by dependencies\n"); lp = _alpm_sortbydeps(trans->packages, PM_TRANS_TYPE_REMOVE); /* free the old alltargs */ @@ -194,7 +194,7 @@ static void unlink_file(pmpkg_t *info, alpm_list_t *lp, pmtrans_t *trans) needbackup = 1; FREE(hash); } - + snprintf(file, PATH_MAX, "%s%s", handle->root, (char *)lp->data); if(trans->type == PM_TRANS_TYPE_REMOVEUPGRADE) { @@ -210,7 +210,7 @@ static void unlink_file(pmpkg_t *info, alpm_list_t *lp, pmtrans_t *trans) _alpm_log(PM_LOG_DEBUG, "file %s does not exist\n", file); return; } - + if(S_ISDIR(buf.st_mode)) { if(rmdir(file)) { /* this is okay, other packages are probably using it (like /usr) */ @@ -343,7 +343,7 @@ int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db) _alpm_log(PM_LOG_ERROR, _("could not remove entry '%s' from cache\n"), pkgname); } - + /* call a done event if this isn't an upgrade */ if(trans->type != PM_TRANS_TYPE_REMOVEUPGRADE) { EVENT(trans, PM_TRANS_EVT_REMOVE_DONE, info, NULL); diff --git a/lib/libalpm/remove.h b/lib/libalpm/remove.h index 5ceba3b2..f1bc58eb 100644 --- a/lib/libalpm/remove.h +++ b/lib/libalpm/remove.h @@ -1,8 +1,8 @@ /* * remove.h - * + * * Copyright (c) 2002-2006 by Judd Vinet - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ #ifndef _ALPM_REMOVE_H diff --git a/lib/libalpm/server.c b/lib/libalpm/server.c index 0ebf3123..9af16e05 100644 --- a/lib/libalpm/server.c +++ b/lib/libalpm/server.c @@ -1,8 +1,8 @@ /* * server.c - * + * * Copyright (c) 2006 by Miklos Vajna - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ @@ -160,7 +160,7 @@ int _alpm_downloadfiles(alpm_list_t *servers, const char *localpath, * set to the final download amount for the calling function to use. * - totalsize is the total download size for use when TotalDownload * is set. Use 0 if the total download size is not known. - * + * * RETURN: 0 for successful download * 1 if the mtimes are identical * -1 on error @@ -227,7 +227,7 @@ int _alpm_downloadfiles_forreal(alpm_list_t *servers, const char *localpath, fileurl->offset = (off_t)0; dl_thisfile = 0; } - + /* libdownload does not reset the error code, reset it in * the case of previous errors */ downloadLastErrCode = 0; @@ -249,7 +249,7 @@ int _alpm_downloadfiles_forreal(alpm_list_t *servers, const char *localpath, } else { _alpm_log(PM_LOG_DEBUG, "connected to %s successfully\n", fileurl->host); } - + if(ust.mtime && mtime1 && ust.mtime == mtime1) { _alpm_log(PM_LOG_DEBUG, "mtimes are identical, skipping %s\n", fn); complete = alpm_list_add(complete, fn); @@ -262,7 +262,7 @@ int _alpm_downloadfiles_forreal(alpm_list_t *servers, const char *localpath, downloadFreeURL(fileurl); return(1); } - + if(ust.mtime && mtime2) { *mtime2 = ust.mtime; } @@ -307,7 +307,7 @@ int _alpm_downloadfiles_forreal(alpm_list_t *servers, const char *localpath, downloadFreeURL(fileurl); return(-1); } - + int nwritten = 0; while(nwritten < nread) { nwritten += fwrite(buffer, 1, (nread - nwritten), localf); @@ -322,7 +322,7 @@ int _alpm_downloadfiles_forreal(alpm_list_t *servers, const char *localpath, } if(nwritten != nread) { - + } dl_thisfile += nread; if (dl_total != NULL) { diff --git a/lib/libalpm/server.h b/lib/libalpm/server.h index f9e4155b..08194d58 100644 --- a/lib/libalpm/server.h +++ b/lib/libalpm/server.h @@ -1,8 +1,8 @@ /* * server.h - * + * * Copyright (c) 2006 by Miklos Vajna - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ #ifndef _ALPM_SERVER_H diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index e5748e6d..40dcffa9 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1,11 +1,11 @@ /* * sync.c - * + * * Copyright (c) 2002-2006 by Judd Vinet * Copyright (c) 2005 by Aurelien Foret * Copyright (c) 2005 by Christian Hamar * Copyright (c) 2005, 2006 by Miklos Vajna - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ @@ -61,7 +61,7 @@ pmsyncpkg_t *_alpm_sync_new(int type, pmpkg_t *spkg, void *data) sync->type = type; sync->pkg = spkg; sync->data = data; - + return(sync); } @@ -109,7 +109,7 @@ static int find_replacements(pmtrans_t *trans, pmdb_t *db_local, for(k = alpm_pkg_get_replaces(spkg); k; k = k->next) { const char *replacement = k->data; - + pmpkg_t *lpkg = _alpm_db_get_pkgfromcache(db_local, replacement); if(!lpkg) { continue; diff --git a/lib/libalpm/sync.h b/lib/libalpm/sync.h index ef094b5c..a5f35607 100644 --- a/lib/libalpm/sync.h +++ b/lib/libalpm/sync.h @@ -1,10 +1,10 @@ /* * sync.h - * + * * Copyright (c) 2002-2006 by Judd Vinet * Copyright (c) 2005 by Aurelien Foret * Copyright (c) 2005, 2006 by Miklos Vajna - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ #ifndef _ALPM_SYNC_H diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index bcd0707d..f740472d 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -5,7 +5,7 @@ * Copyright (c) 2005 by Aurelien Foret * Copyright (c) 2005 by Christian Hamar * Copyright (c) 2005, 2006 by Miklos Vajna - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ diff --git a/lib/libalpm/trans.h b/lib/libalpm/trans.h index 79b8c20f..e96a7c1f 100644 --- a/lib/libalpm/trans.h +++ b/lib/libalpm/trans.h @@ -1,11 +1,11 @@ /* * trans.h - * + * * Copyright (c) 2002-2006 by Judd Vinet * Copyright (c) 2005 by Aurelien Foret * Copyright (c) 2005 by Christian Hamar * Copyright (c) 2006 by Miklos Vajna - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ #ifndef _ALPM_TRANS_H diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 95c12571..a04256ef 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -6,7 +6,7 @@ * Copyright (c) 2005 by Christian Hamar * Copyright (c) 2006 by David Kimpe * Copyright (c) 2005, 2006 by Miklos Vajna - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ @@ -308,7 +308,7 @@ char *_alpm_strreplace(const char *str, const char *needle, const char *replace) while (1) { q = strstr(p, needle); - if(!q) { /* not found */ + if(!q) { /* not found */ if(*p) { /* add the rest of 'p' */ _strnadd(&newstr, p, strlen(p)); @@ -343,7 +343,7 @@ int _alpm_lckmk() } _alpm_makepath(dir); - while((fd = open(file, O_WRONLY | O_CREAT | O_EXCL, 0000)) == -1 && errno == EACCES) { + while((fd = open(file, O_WRONLY | O_CREAT | O_EXCL, 0000)) == -1 && errno == EACCES) { if(++count < 1) { sleep(1); } else { diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index def21047..89ac3204 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -1,12 +1,12 @@ /* * util.h - * + * * Copyright (c) 2002-2006 by Judd Vinet * Copyright (c) 2005 by Aurelien Foret * Copyright (c) 2005 by Christian Hamar * Copyright (c) 2006 by David Kimpe * Copyright (c) 2005, 2006 by Miklos Vajna - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ #ifndef _ALPM_UTIL_H -- cgit v1.2.3-70-g09d2