From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-5.6 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 4D455203C1 for ; Tue, 13 Dec 2016 01:41:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932560AbcLMBlH (ORCPT ); Mon, 12 Dec 2016 20:41:07 -0500 Received: from mail-pf0-f172.google.com ([209.85.192.172]:33782 "EHLO mail-pf0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753027AbcLMBlB (ORCPT ); Mon, 12 Dec 2016 20:41:01 -0500 Received: by mail-pf0-f172.google.com with SMTP id d2so15453218pfd.0 for ; Mon, 12 Dec 2016 17:41:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+6Cqlioj+Z6DG62HRKsXBcKywZ75B8/I/f/RmY7wEvI=; b=hRxqCGgUhUx8M4iFx5mUPzxopnpf6gAwhpO7GLDfyObcI84oSonNXWmY6YKuvLREyW hIw5H2qCJcy07xXtFoALPhh2RId2K4/Y1X2+czGZpoGX7et1PuyOtxqLrZka74eZBod1 guzyef7njICPvsUJBm4cmwUNm4PZMt+bOL1qJy0Vt2eruuujUdO0qw4lq7zX1g9E6BHs ArDuVJiNWn6NTnF8c7PwpUPd7Bl8DKGo+ViM3GXNKeOKBnH/N2++31x1315Nr1yW8ywV CWRhCbRc3CUhUXPFHhWy5m9HBzvwPccWFVocByEoHGT0/14Mx2TENqi9QhnGMn5ywxaQ N2Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+6Cqlioj+Z6DG62HRKsXBcKywZ75B8/I/f/RmY7wEvI=; b=RdwzkMqwirbYkjD06fEnh1r5cU0GmUDoNhuT7/sKGmHFcPJYiRlG5Mz1vOzC4pgl2f N+QwPi9SsMUB0DJDVuyHVbBDPM6myGYZmakb0YpELKy7qeUMx6BVnyFPr0EZPWkf2qW3 KRn5gGD90PRbcRipsyFhGmAndWkr7DrJgImKLSBukksWsAOy3+1OrScnP0T5u8kMsmtf MXjqoowqdrvHxSaKwJIo+J/UMc5Lf+eO4l+9FTUkJMjoFhZwFnkSBCl1z7OlusqQ6GQ4 cJs+qess2MUsV8oUIicpRjuS5ELJx3YE3mnfYo/Z3ZI/llugTzkt3slCuTrwY22MJ1j0 aEKQ== X-Gm-Message-State: AKaTC02DizZRHr0Vt19vp3l9es6Wcix2awybjHv+m72R/yxvSxz5ELZQQjhp6eadjtedrdmW X-Received: by 10.99.139.199 with SMTP id j190mr172477160pge.115.1481593260506; Mon, 12 Dec 2016 17:41:00 -0800 (PST) Received: from localhost ([2620:0:1000:5b10:642c:37a4:3709:a2b3]) by smtp.gmail.com with ESMTPSA id n17sm78075668pfg.80.2016.12.12.17.40.59 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Mon, 12 Dec 2016 17:41:00 -0800 (PST) From: Stefan Beller To: gitster@pobox.com Cc: git@vger.kernel.org, David.Turner@twosigma.com, bmwill@google.com, Stefan Beller Subject: [PATCH 1/6] submodule.h: add extern keyword to functions Date: Mon, 12 Dec 2016 17:40:50 -0800 Message-Id: <20161213014055.14268-2-sbeller@google.com> X-Mailer: git-send-email 2.11.0.rc2.35.g26e18c9 In-Reply-To: <20161213014055.14268-1-sbeller@google.com> References: <20161213014055.14268-1-sbeller@google.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org As the upcoming series will add a lot of functions to the submodule header, let's first make the header consistent to the rest of the project by adding the extern keyword to functions. As per the CodingGuidelines we try to stay below 80 characters per line, so adapt all those functions to stay below 80 characters that are already using more than one line. Those function using just one line are better kept in one line than breaking them up into multiple lines just for the goal of staying below the character limit as it makes grepping for functions easier if they are one liners. Signed-off-by: Stefan Beller --- submodule.h | 55 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/submodule.h b/submodule.h index 6229054b99..61fb610749 100644 --- a/submodule.h +++ b/submodule.h @@ -29,50 +29,55 @@ struct submodule_update_strategy { }; #define SUBMODULE_UPDATE_STRATEGY_INIT {SM_UPDATE_UNSPECIFIED, NULL} -int is_staging_gitmodules_ok(void); -int update_path_in_gitmodules(const char *oldpath, const char *newpath); -int remove_path_from_gitmodules(const char *path); -void stage_updated_gitmodules(void); -void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt, +extern int is_staging_gitmodules_ok(void); +extern int update_path_in_gitmodules(const char *oldpath, const char *newpath); +extern int remove_path_from_gitmodules(const char *path); +extern void stage_updated_gitmodules(void); +extern void set_diffopt_flags_from_submodule_config(struct diff_options *, const char *path); -int submodule_config(const char *var, const char *value, void *cb); -void gitmodules_config(void); -int parse_submodule_update_strategy(const char *value, +extern int submodule_config(const char *var, const char *value, void *cb); +extern void gitmodules_config(void); +extern int parse_submodule_update_strategy(const char *value, struct submodule_update_strategy *dst); -const char *submodule_strategy_to_string(const struct submodule_update_strategy *s); -void handle_ignore_submodules_arg(struct diff_options *diffopt, const char *); -void show_submodule_summary(FILE *f, const char *path, +extern const char *submodule_strategy_to_string(const struct submodule_update_strategy *s); +extern void handle_ignore_submodules_arg(struct diff_options *, const char *); +extern void show_submodule_summary(FILE *f, const char *path, const char *line_prefix, struct object_id *one, struct object_id *two, unsigned dirty_submodule, const char *meta, const char *del, const char *add, const char *reset); -void show_submodule_inline_diff(FILE *f, const char *path, +extern void show_submodule_inline_diff(FILE *f, const char *path, const char *line_prefix, struct object_id *one, struct object_id *two, unsigned dirty_submodule, const char *meta, const char *del, const char *add, const char *reset, const struct diff_options *opt); -void set_config_fetch_recurse_submodules(int value); -void check_for_new_submodule_commits(unsigned char new_sha1[20]); -int fetch_populated_submodules(const struct argv_array *options, +extern void set_config_fetch_recurse_submodules(int value); +extern void check_for_new_submodule_commits(unsigned char new_sha1[20]); +extern int fetch_populated_submodules(const struct argv_array *options, const char *prefix, int command_line_option, int quiet, int max_parallel_jobs); -unsigned is_submodule_modified(const char *path, int ignore_untracked); -int submodule_uses_gitfile(const char *path); -int ok_to_remove_submodule(const char *path); -int merge_submodule(unsigned char result[20], const char *path, const unsigned char base[20], - const unsigned char a[20], const unsigned char b[20], int search); -int find_unpushed_submodules(unsigned char new_sha1[20], const char *remotes_name, - struct string_list *needs_pushing); -int push_unpushed_submodules(unsigned char new_sha1[20], const char *remotes_name); -int parallel_submodules(void); +extern unsigned is_submodule_modified(const char *path, int ignore_untracked); +extern int submodule_uses_gitfile(const char *path); +extern int ok_to_remove_submodule(const char *path); +extern int merge_submodule(unsigned char result[20], const char *path, + const unsigned char base[20], + const unsigned char a[20], + const unsigned char b[20], int search); +extern int find_unpushed_submodules(unsigned char new_sha1[20], + const char *remotes_name, + struct string_list *needs_pushing); +extern int push_unpushed_submodules(unsigned char new_sha1[20], + const char *remotes_name); +extern void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir); +extern int parallel_submodules(void); /* * Prepare the "env_array" parameter of a "struct child_process" for executing * a submodule by clearing any repo-specific envirionment variables, but * retaining any config in the environment. */ -void prepare_submodule_repo_env(struct argv_array *out); +extern void prepare_submodule_repo_env(struct argv_array *out); #define ABSORB_GITDIR_RECURSE_SUBMODULES (1<<0) extern void absorb_git_dir_into_superproject(const char *prefix, -- 2.11.0.rc2.35.g7af3268