From owner-svn-src-user@FreeBSD.ORG Thu Jun 17 09:36:24 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 48C35106564A; Thu, 17 Jun 2010 09:36:24 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 383D48FC0C; Thu, 17 Jun 2010 09:36:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5H9aOG1082425; Thu, 17 Jun 2010 09:36:24 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5H9aOjX082422; Thu, 17 Jun 2010 09:36:24 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201006170936.o5H9aOjX082422@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Thu, 17 Jun 2010 09:36:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r209245 - user/ae/usr.sbin/sade X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jun 2010 09:36:24 -0000 Author: ae Date: Thu Jun 17 09:36:23 2010 New Revision: 209245 URL: http://svn.freebsd.org/changeset/base/209245 Log: Rewrap long lines. Modified: user/ae/usr.sbin/sade/customdlg.c user/ae/usr.sbin/sade/parted.c Modified: user/ae/usr.sbin/sade/customdlg.c ============================================================================== --- user/ae/usr.sbin/sade/customdlg.c Thu Jun 17 08:49:31 2010 (r209244) +++ user/ae/usr.sbin/sade/customdlg.c Thu Jun 17 09:36:23 2010 (r209245) @@ -159,7 +159,8 @@ dlg_focus_prev(struct custom_dlg *dlg) } DLG_LABEL * -dlg_add_label(struct custom_dlg *dlg, int y, int x, int w, int h, const char *title) +dlg_add_label(struct custom_dlg *dlg, int y, int x, int w, int h, + const char *title) { DLG_LABEL *item; @@ -367,7 +368,8 @@ dlg_add_button(struct custom_dlg *dlg, i } static int -dlg_button_proc(struct custom_dlg *dlg, DLG_BUTTON *item, int (*key_handler)(int )) +dlg_button_proc(struct custom_dlg *dlg, DLG_BUTTON *item, + int (*key_handler)(int )) { int key, ret = 0; @@ -641,7 +643,8 @@ dlg_checkbox_toggle(struct custom_dlg *d } static int -dlg_checkbox_proc(struct custom_dlg *dlg, DLG_CHECKBOX *item, int (*key_handler)(int )) +dlg_checkbox_proc(struct custom_dlg *dlg, DLG_CHECKBOX *item, + int (*key_handler)(int )) { int key, ret = 0; @@ -760,8 +763,8 @@ dlg_proc(struct custom_dlg *dlg, int (*k key_handler); break; case CHECKBOX: - ret = dlg_checkbox_proc(dlg, (DLG_CHECKBOX *)item, - key_handler); + ret = dlg_checkbox_proc(dlg, + (DLG_CHECKBOX *)item, key_handler); break; default: err(EX_SOFTWARE, "unknown dlg_item type"); Modified: user/ae/usr.sbin/sade/parted.c ============================================================================== --- user/ae/usr.sbin/sade/parted.c Thu Jun 17 08:49:31 2010 (r209244) +++ user/ae/usr.sbin/sade/parted.c Thu Jun 17 09:36:23 2010 (r209245) @@ -119,8 +119,8 @@ static char *set_label_title = "Please e static const char *apm_aliases[] = { "freebsd", "freebsd-swap", "freebsd-ufs", "freebsd-vinum", "freebsd-zfs", NULL }; -static const char *bsd_aliases[] = { "freebsd-swap", "freebsd-ufs", "freebsd-vinum", - "freebsd-zfs", NULL }; +static const char *bsd_aliases[] = { "freebsd-swap", "freebsd-ufs", + "freebsd-vinum", "freebsd-zfs", NULL }; static const char *gpt_aliases[] = { "freebsd", "freebsd-boot", "freebsd-swap", "freebsd-ufs", "freebsd-vinum", "freebsd-zfs", "apple-boot", "apple-hfs", "apple-label", "apple-raid", "apple-raid-offline", @@ -162,7 +162,8 @@ again: if (ret == EINVAL && loaded == 0) { loaded = dmenu_open_yesno(kldload_msg); if (loaded == 0) { - loaded = kldload(sade_schemes[pitem->aux].module); + loaded = kldload( + sade_schemes[pitem->aux].module); if (loaded != -1) goto again; else @@ -370,8 +371,8 @@ again: } if (list == apm_aliases || list == gpt_aliases) label = dlg_edit_get_value(&dlg, eLabel); - ret = de_part_add(ppart->de_device, dlg_edit_get_value(&dlg, eType), - (off_t)start, (off_t)size, label, 0); + ret = de_part_add(ppart->de_device, dlg_edit_get_value(&dlg, + eType), (off_t)start, (off_t)size, label, 0); if (ret != 0) { dmenu_open_errormsg((ret < 0) ? de_error(): strerror(ret)); @@ -673,10 +674,16 @@ resize: selected = ppart; } mvprintw(row, 0, "%12s%20s%12s%11jd%11jd%6s%7s", - hscroll_str(dname, 12, LABEL(ppart->de_name), - selected == ppart ? hsc: 0, HSCROLL_LEFT), - hscroll_str(dtype, 19, LABEL(ppart->de_type), 0, HSCROLL_RIGHT), - hscroll_str(dlabel,11, LABEL(ppart->de_label), 0, HSCROLL_RIGHT), + hscroll_str(dname, 12, + LABEL(ppart->de_name), + selected == ppart ? hsc: 0, + HSCROLL_LEFT), + hscroll_str(dtype, 19, + LABEL(ppart->de_type), 0, + HSCROLL_RIGHT), + hscroll_str(dlabel,11, + LABEL(ppart->de_label), 0, + HSCROLL_RIGHT), ppart->de_start, ppart->de_end, fmtsize((ppart->de_end - ppart->de_start + 1) * @@ -707,7 +714,8 @@ resize: "L = Set Label"); } mvprintw(height + PARTED_MENU_TOP + 8, 0, - "Use F1 or ? to get more help, arrow keys to select"); + "Use F1 or ? to get more help, arrow keys to " + "select"); set_statusline(msg); if (msg) msg = NULL; @@ -721,7 +729,8 @@ resize: if (selected->de_type == NULL || ( strcmp(selected->de_type, "freebsd") != 0 #ifdef WITH_ZFS - && strcmp(selected->de_type, "freebsd-zfs") != 0 + && strcmp(selected->de_type, + "freebsd-zfs") != 0 #endif )) { msg = "This is not a freebsd slice " @@ -771,9 +780,11 @@ resize: break; } if (key == KEY_ESC) - ret = dmenu_open_noyes(pending_write_msg); + ret = dmenu_open_noyes( + pending_write_msg); else - ret = dmenu_open_yesno(pending_write_msg); + ret = dmenu_open_yesno( + pending_write_msg); if (ret) error = de_dev_undo(pdev); else @@ -798,7 +809,8 @@ resize: break; case 'D': if (count == 1 && selected->de_type == NULL) { - if (dmenu_open_noyes(destroy_scheme_msg)) + if (dmenu_open_noyes( + destroy_scheme_msg)) break; error = de_dev_scheme_destroy(pdev); if (error != 0) @@ -834,8 +846,8 @@ resize: break; } if (selected->de_type == NULL) { - msg = "Slice is unused, create it first " - "or move to another one."; + msg = "Slice is unused, create it " + "first or move to another one."; break; } ret = parted_set_label(selected); @@ -871,8 +883,8 @@ resize: break; case 'T': if (selected->de_type == NULL) { - msg = "Slice in unused, create it first " - "or move to another one."; + msg = "Slice in unused, create it " + "first or move to another one."; break; } ret = parted_set_type(selected);