Print this page
patch tsoome-feedback

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/libcmdutils/common/process_xattrs.c
          +++ new/usr/src/lib/libcmdutils/common/process_xattrs.c
↓ open down ↓ 210 lines elided ↑ open up ↑
 211  211                      VIEW_READWRITE) == 0)
 212  212                          goto done;
 213  213  
 214  214                  if (errno == EPERM)
 215  215                          etext = dgettext(TEXT_DOMAIN, "Permission denied");
 216  216                  else
 217  217                          etext = dgettext(TEXT_DOMAIN,
 218  218                              "failed to move system attribute");
 219  219          }
 220  220  error:
 221      -        if (res != NULL)
 222      -                nvlist_free(res);
      221 +        nvlist_free(res);
 223  222          if (silent == 0 && etext != NULL) {
 224  223                  if (!sattr)
 225  224                          (void) fprintf(stderr, dgettext(TEXT_DOMAIN,
 226  225                              "%s: %s: cannot move extended attributes, "),
 227  226                              cmd, infile);
 228  227                  else
 229  228                          (void) fprintf(stderr, dgettext(TEXT_DOMAIN,
 230  229                              "%s: %s: cannot move extended system "
 231  230                              "attributes, "), cmd, infile);
 232  231                  perror(etext);
↓ open down ↓ 6 lines elided ↑ open up ↑
 239  238          if (tattrfd != -1)
 240  239                  (void) close(tattrfd);
 241  240          if (asfd != -1)
 242  241                  (void) close(asfd);
 243  242          if (atfd != -1)
 244  243                  (void) close(atfd);
 245  244          if (indfd != -1)
 246  245                  (void) close(indfd);
 247  246          if (outdfd != -1)
 248  247                  (void) close(outdfd);
 249      -        if (response != NULL)
 250      -                nvlist_free(response);
      248 +        nvlist_free(response);
 251  249          if (etext != NULL)
 252  250                  return (1);
 253  251          else
 254  252                  return (0);
 255  253  }
 256  254  
 257  255  /*
 258  256   * The function returns non default extended system attribute list
 259  257   * associated with 'fname' and returns NULL when an error has occured
 260  258   * or when only extended system attributes other than archive,
↓ open down ↓ 51 lines elided ↑ open up ↑
 312  310                                  break;
 313  311                          case DATA_TYPE_UINT64_ARRAY:
 314  312                                  if (fattr != F_CRTIME)
 315  313                                          return (response);
 316  314                                  break;
 317  315                          case DATA_TYPE_NVLIST:
 318  316                          default:
 319  317                                  return (response);
 320  318                  }
 321  319          }
 322      -        if (response != NULL)
 323      -                nvlist_free(response);
      320 +        nvlist_free(response);
 324  321          return (NULL);
 325  322  }
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX