Print this page
10097 indenting fixes in usr/src/{lib,common}

Split Close
Expand all
Collapse all
          --- old/usr/src/common/devid/devid.c
          +++ new/usr/src/common/devid/devid.c
↓ open down ↓ 15 lines elided ↑ open up ↑
  16   16   * If applicable, add the following below this CDDL HEADER, with the
  17   17   * fields enclosed by brackets "[]" replaced with your own identifying
  18   18   * information: Portions Copyright [yyyy] [name of copyright owner]
  19   19   *
  20   20   * CDDL HEADER END
  21   21   */
  22   22  /*
  23   23   * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
  24   24   * Use is subject to license terms.
  25   25   */
  26      -#pragma ident   "%Z%%M% %I%     %E% SMI"
  27   26  
       27 +/*
       28 + * Copyright (c) 2018, Joyent, Inc.
       29 + */
       30 +
  28   31  #include <sys/types.h>
  29   32  #include <sys/stropts.h>
  30   33  #include <sys/debug.h>
  31   34  #include <sys/isa_defs.h>
  32   35  #include <sys/dditypes.h>
  33   36  #include <sys/ddi_impldefs.h>
  34   37  #include "devid_impl.h"
  35   38  
  36   39  static int devid_str_decode_id(char *devidstr, ddi_devid_t *devidp,
  37   40      char **minor_namep, impl_devid_t *id);
↓ open down ↓ 342 lines elided ↑ open up ↑
 380  383                  /* add in size of the binary devid header */
 381  384                  devid_len = id_len + sizeof (*id) - sizeof (id->did_id);
 382  385  
 383  386                  /*
 384  387                   * Allocate space for devid if we are asked to decode it
 385  388                   * decode it and space wasn't pre-allocated.
 386  389                   */
 387  390                  if (pre_alloc == FALSE) {
 388  391                          if ((id = (impl_devid_t *)DEVID_MALLOC(
 389  392                              devid_len)) == NULL)
 390      -                        return (DEVID_FAILURE);
      393 +                                return (DEVID_FAILURE);
 391  394                  }
 392  395  
 393  396                  /* decode header portion of the string into the binary devid */
 394  397                  dsp = devidstr;
 395  398                  id->did_magic_hi = *dsp++;              /* <magic> "id" */
 396  399                  id->did_magic_lo = *dsp++;
 397  400                  id->did_rev_hi = 0;
 398  401                  id->did_rev_lo =
 399  402                      DEVID_REV_ASCIITOBIN(*dsp);         /* <rev> "1" */
 400  403                  dsp++;                                  /* skip "1" */
↓ open down ↓ 119 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX