Removed some unused old code branches

libisoburn/trunk/xorriso/xorriso.c

@@ -5641,29 +5641,11 @@ int Xorriso_status_result(struct XorrisO *xorriso, char *filter, FILE *fp,
 bit1= do only report to fp
 */
 {
-
-#ifdef NIX
-
- int ret,l;
-
- if(filter!=NULL)
-   if(filter[0]=='-') {
-     l= strlen(filter);
-     if(strncmp(filter,xorriso->result_line,l)!=0)
-       return(2);
-   }
-
-#else
-
  int ret;
 
  ret= Xorriso_status_filter(xorriso, filter, xorriso->result_line, 0);
  if(ret <= 0)
    return(2);
-
-#endif /* NIX */
-
-
  if(!(flag&2))
    Xorriso_result(xorriso,0);
  if(fp!=NULL) {
@@ -15052,12 +15034,6 @@ int Xorriso_option_map_l(struct XorrisO *xorriso, int argc, char **argv,
    }
    strcat(eff_target, source_pt);
 
-#ifdef NIX
-   if(1)
-     fprintf(stderr, "xorriso_debug: %s %s %s\n", cmd, eff_source, eff_target);
-   else
-#endif
-
    if(mode==0)
      ret= Xorriso_option_map(xorriso, eff_source, eff_target, 2);
    else if(mode==1)

libisoburn/trunk/xorriso/xorriso_timestamp.h

@@ -1 +1 @@
-#define Xorriso_timestamP "2009.04.07.120250"
+#define Xorriso_timestamP "2009.04.07.122117"

libisoburn/trunk/xorriso/xorrisoburn.c

@@ -9304,15 +9304,8 @@ int Xorriso_getfattr(struct XorrisO *xorriso, void *in_node, char *path,
  }
  ret= 1;
 ex:;
-
-#ifndef NIX
  Xorriso_get_attrs(xorriso, in_node, path, &num_attrs, &names,
                    &value_lengths, &values, 1 << 15);
-#else /* NIX */
- iso_node_get_attrs(node, &num_attrs, &names, &value_lengths,
-                    &values, 1 << 15); /* free memory */
-#endif /* NIX */
-
  return(ret);
 }
 
@@ -9895,13 +9888,8 @@ int Xorriso_set_filter(struct XorrisO *xorriso, void *in_node,
  struct Xorriso_extF *found_filter;
  IsoExternalFilterCommand *cmd = NULL;
  char *old_name= NULL, new_name[SfileadrL], *suffix= "";
-
-#ifndef NIX
  IsoStream *stream;
  int is_renamed= 0;
-#else
- int lo= 0, ls= 0;
-#endif
 
  new_name[0]= 0;
 
@@ -9945,8 +9933,6 @@ int Xorriso_set_filter(struct XorrisO *xorriso, void *in_node,
 
  if(suffix[0]) {
 
-#ifndef NIX
-
    /* >>> would need full iso_rr_path of node for showing */;
 
    old_name= strdup((char *) iso_node_get_name(node));
@@ -9955,72 +9941,6 @@ int Xorriso_set_filter(struct XorrisO *xorriso, void *in_node,
    if(ret <= 0 || ret == 2)
      goto ex;
    is_renamed= 1;
-
-#else /* ! NIX */
-
-   old_name= strdup((char *) iso_node_get_name(node));
-   lo= strlen(old_name);
-   ls= strlen(suffix);
-   if(strip_suffix) {
-     if(lo <= ls) {
-       /* refuse gracefully */
-       ret= 2; goto ex;
-     }
-     if(strcmp(old_name + lo - ls, suffix) != 0) {
-       ret= 2; goto ex;
-     }
-     if(lo >= sizeof(new_name))
-       goto cannot_remove_suffix;
-     strcpy(new_name, old_name);
-     new_name[lo - ls]= 0;
-     ret = iso_node_set_name(node, new_name);
-     if (ret < 0) {
-       Xorriso_process_msg_queues(xorriso,0);
-       if (!(flag & 1))
-         Xorriso_report_iso_error(xorriso, "", ret,
-                              "Error when renaming ISO node", 0, "FAILURE", 1);
-cannot_remove_suffix:;
-
-       /* >>> would need full iso_rr_path of node */;
-
-       strcpy(xorriso->info_text, "-set_filter: Cannot remove suffix from ");
-       Text_shellsafe(old_name, xorriso->info_text, 1);
-       Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0,
-                           (flag & 1) ? "WARNING" : "FAILURE", 0);
-       ret= 2 * (flag & 1); goto ex;
-     }
-   } else {
-     /* check whether suffix already present */
-     if(lo >= ls)
-       if(strcmp(old_name + lo - ls, suffix) == 0) {
-         /* refuse gracefully */
-         ret= 2; goto ex;
-       }
-     if(lo + ls > 255) {
-cannot_append_suffix:;
-
-       /* >>> would need full iso_rr_path of node */;
-
-       strcpy(xorriso->info_text, "-set_filter: Cannot append suffix to ");
-       Text_shellsafe(old_name, xorriso->info_text, 1);
-       strcat(xorriso->info_text, ". Left unfiltered.");
-       Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0,
-                           (flag & 1) ? "WARNING" : "FAILURE", 0);
-       ret= 2 * (flag & 1); goto ex;
-     } 
-     sprintf(new_name, "%s%s", old_name, suffix);
-     ret = iso_node_set_name(node, new_name);
-     if (ret < 0) {
-       Xorriso_process_msg_queues(xorriso,0);
-       if (!(flag & 1))
-         Xorriso_report_iso_error(xorriso, "", ret,
-                              "Error when renaming ISO node", 0, "FAILURE", 1);
-       goto cannot_append_suffix;
-     }
-   }
-
-#endif /* ! NIX */
-
  }
 
  if(strip_filter) {