Changeset 7869e48 for functions.c

Timestamp:

Jan 12, 2013, 1:43:13 PM (12 years ago)

Author:

Jason Gross <jgross@mit.edu>

Children:

e3a0d71, 4485285

Parents:

4626016

git-author:

Jason Gross <jgross@mit.edu> (01/12/13 13:13:18)

git-committer:

Jason Gross <jgross@mit.edu> (01/12/13 13:43:13)

Message:

Remove trailing whitespace

This commit was made with the command sequence

    for i in $(git ls-files | tr '\n' ' ');
    do
      echo $i; sed -i s'/\s\+$//g' "$(readlink -f $i)";
    done

File:

• functions.c (modified) (52 diffs)

functions.c

@@ -8 +8 @@
 {
   owl_function_debugmsg("executing command: %s", cmdbuff);
-  return owl_cmddict_execute(owl_global_get_cmddict(&g), 
+  return owl_cmddict_execute(owl_global_get_cmddict(&g),
                              owl_global_get_context(&g), cmdbuff);
 }
@@ -198 +198 @@
   m=g_new(owl_message, 1);
   owl_message_create_admin(m, header, body);
-  
+
   /* add it to the global list and current view */
   owl_messagelist_append_element(owl_global_get_msglist(&g), m);
@@ -250 +250 @@
   /* error if we're not logged into aim */
   if (!owl_global_is_aimloggedin(&g)) return(NULL);
-  
+
   m=g_new(owl_message, 1);
   owl_message_create_aim(m,
@@ -455 +455 @@
   if (unwrap)
     owl_text_wordunwrap(format_msg);
-  
+
   /* send the message */
   ret=owl_aim_send_im(to, format_msg);
@@ -485 +485 @@
   format_msg=g_strdup(msg);
   owl_text_wordunwrap(format_msg);
-  
+
   /* send the message */
   ret=owl_aim_send_awaymsg(to, format_msg);
@@ -534 +534 @@
 
 /* If filter is non-null, looks for the next message matching
- * that filter.  If skip_deleted, skips any deleted messages. 
+ * that filter.  If skip_deleted, skips any deleted messages.
  * If last_if_none, will stop at the last message in the view
  * if no matching messages are found.  */
@@ -707 +707 @@
 
   if (move_after) {
-    /* move the poiner in the appropriate direction 
+    /* move the poiner in the appropriate direction
      * to the next undeleted msg */
     if (owl_global_get_direction(&g)==OWL_DIRECTION_UPWARDS) {
@@ -723 +723 @@
 
   v=owl_global_get_current_view(&g);
-  
+
   if (owl_view_get_size(v) < 1) {
     owl_function_error("No current message to undelete");
@@ -801 +801 @@
 
   owl_function_redisplay_to_nearest(lastmsgid, v);
-  
+
   owl_function_makemsg("Messages expunged");
 }
@@ -820 +820 @@
   v=owl_global_get_current_view(&g);
   oldcurmsg=owl_global_get_curmsg(&g);
-  curmsg=owl_view_get_size(v)-1;  
+  curmsg=owl_view_get_size(v)-1;
   if (curmsg<0) curmsg=0;
   owl_global_set_curmsg(&g, curmsg);
@@ -830 +830 @@
     owl_global_set_topmsg(&g, curmsg+1);
     owl_global_set_curmsg(&g, curmsg+1);
-  } 
+  }
   owl_mainwin_redisplay(owl_global_get_mainwin(&g));
   owl_global_set_direction_downwards(&g);
@@ -995 +995 @@
 {
   char *ret;
-  
+
   /* zlog out if we need to */
   if (owl_global_is_havezephyr(&g) &&
@@ -1010 +1010 @@
     kill(owl_global_get_newmsgproc_pid(&g), SIGHUP);
   }
-  
+
   /* Quit AIM */
   if (owl_global_is_aimloggedin(&g)) {
@@ -1060 +1060 @@
 }
 
-/* Returns what the new topmsg should be.  
- * Passed the last direction of movement, 
+/* Returns what the new topmsg should be.
+ * Passed the last direction of movement,
  * the current view,
  * the current message number in the view,
@@ -1074 +1074 @@
 int owl_function_calculate_topmsg_neartop(int direction, const owl_view *v, int curmsg, int topmsg, int recwinlines)
 {
-  if (curmsg>0 
+  if (curmsg>0
       && (owl_message_get_numlines(owl_view_get_element(v, curmsg-1))
           <  recwinlines/2)) {
@@ -1082 +1082 @@
   }
 }
-  
+
 int owl_function_calculate_topmsg_center(int direction, const owl_view *v, int curmsg, int topmsg, int recwinlines)
 {
@@ -1096 +1096 @@
   return(last);
 }
-  
+
 int owl_function_calculate_topmsg_paged(int direction, const owl_view *v, int curmsg, int topmsg, int recwinlines, int center_on_page)
 {
   int i, last, lines, savey;
-  
-  /* If we're off the top of the screen, scroll up such that the 
+
+  /* If we're off the top of the screen, scroll up such that the
    * curmsg is near the botton of the screen. */
   if (curmsg < topmsg) {
@@ -1142 +1142 @@
 
   if (curmsg<0) return(topmsg);
-    
+
   /* If we're off the top of the screen then center */
   if (curmsg<topmsg) {
@@ -1167 +1167 @@
     direction=OWL_DIRECTION_UPWARDS;
   }
-  
+
   /* If our bottom line is less than 1/4 down the screen then scroll up */
   if (direction == OWL_DIRECTION_UPWARDS || direction == OWL_DIRECTION_NONE) {
@@ -1386 +1386 @@
 
   owl_fmtext_init_null(&fm);
-  
+
   v=owl_global_get_current_view(&g);
   m=owl_view_get_element(v, owl_global_get_curmsg(&g));
@@ -1422 +1422 @@
   if (owl_message_is_type_zephyr(m)) {
     owl_fmtext_append_bold(&fm, "\nZephyr Specific Information:\n");
-    
+
     owl_fmtext_appendf_normal(&fm, "  Class     : %s\n", owl_message_get_class(m));
     owl_fmtext_appendf_normal(&fm, "  Instance  : %s\n", owl_message_get_instance(m));
@@ -1493 +1493 @@
   owl_message_attributes_tofmtext(m, &attrfm);
   owl_fmtext_append_fmtext(&fm, &attrfm);
-  
+
   owl_function_popless_fmtext(&fm);
   owl_fmtext_cleanup(&fm);
@@ -1548 +1548 @@
       return;
     }
-    
+
     /* Bail if we're not truncated */
     if (!owl_mainwin_is_curmsg_truncated(owl_global_get_mainwin(&g))) {
@@ -1555 +1555 @@
     }
   }
-  
-  
+
+
   /* don't scroll past the last line */
   if (step>0) {
@@ -1574 +1574 @@
     }
   }
-  
+
   /* redisplay */
   owl_mainwin_redisplay(owl_global_get_mainwin(&g));
@@ -1617 +1617 @@
     owl_function_popless_text("Error getting subscriptions");
   }
-           
+
   g_free(buff);
 }
@@ -1658 +1658 @@
   const owl_variable *v;
   GPtrArray *varnames;
-  owl_fmtext fm;  
+  owl_fmtext fm;
   int i;
   const char *varname;
 
   owl_fmtext_init_null(&fm);
-  owl_fmtext_append_bold(&fm, 
+  owl_fmtext_append_bold(&fm,
       "Variables: (use 'show variable <name>' for details)\n");
   varnames = owl_variable_dict_get_names(owl_global_get_vardict(&g));
@@ -1681 +1681 @@
 {
   const owl_variable *v;
-  owl_fmtext fm;  
+  owl_fmtext fm;
 
   owl_fmtext_init_null(&fm);
@@ -1819 +1819 @@
   owl_fmtext_append_normal(&fm, "no\n");
 #endif
-  
+
 
   owl_fmtext_append_normal(&fm, "\nAIM Status:\n");
@@ -1872 +1872 @@
   const owl_message *m;
   const owl_filter *f;
-  
+
   if (owl_view_get_size(owl_global_get_current_view(&g))==0) {
     owl_function_error("No message selected");
   } else {
     char *cmd;
-    
+
     m=owl_view_get_element(owl_global_get_current_view(&g), owl_global_get_curmsg(&g));
     if (!m) {
@@ -2020 +2020 @@
 #if OWL_STDERR_REDIR
   redirect = " < /dev/null";
-#endif 
+#endif
 
   if (argc<2) {
@@ -2036 +2036 @@
     out = owl_slurp(p);
     pclose(p);
-    
+
     if (type == OWL_OUTPUT_RETURN) {
       g_free(newbuff);
@@ -2067 +2067 @@
 
   perlout = owl_perlconfig_execute(buff);
-  if (perlout) { 
+  if (perlout) {
     if (type == OWL_OUTPUT_POPUP) {
       owl_function_popless_text(perlout);
@@ -2114 +2114 @@
   /* Figure out what to set the current message to.
    * - If the view we're leaving has messages in it, go to the closest message
-   *   to the last message pointed to in that view. 
+   *   to the last message pointed to in that view.
    * - If the view we're leaving is empty, try to restore the position
    *   from the last time we were in the new view.  */
@@ -2227 +2227 @@
 
   owl_function_debugmsg("owl_function_create_negative_filter");
-  
+
   if (!strncmp(filtername, "not-", 4)) {
     newname=g_strdup(filtername+4);
@@ -2316 +2316 @@
  * If 'related' is nonzero, encompass unclasses and .d classes as well.
  */
-CALLER_OWN char *owl_function_classinstfilt(const char *c, const char *i, int related) 
+CALLER_OWN char *owl_function_classinstfilt(const char *c, const char *i, int related)
 {
   owl_filter *f;
@@ -2350 +2350 @@
     }
   }
-  
+
   /* if it already exists then go with it.  This lets users override */
   if (owl_global_get_filter(&g, filtname)) {
@@ -2540 +2540 @@
   owl_function_makemsg("%i messages marked for %sdeletion", j, flag?"":"un");
 
-  owl_mainwin_redisplay(owl_global_get_mainwin(&g));  
+  owl_mainwin_redisplay(owl_global_get_mainwin(&g));
 }
 
@@ -2588 +2588 @@
  * If the curmsg is a zephyr class message, instance foo, recip *,
  *    return a filter name to the class, inst.
- * If the curmsg is a zephyr class message and type==0 then 
+ * If the curmsg is a zephyr class message and type==0 then
  *    return a filter name for just the class.
- * If the curmsg is a zephyr class message and type==1 then 
+ * If the curmsg is a zephyr class message and type==1 then
  *    return a filter name for the class and instance.
  * If the curmsg is a personal AIM message returna  filter
- *    name to the AIM conversation with that user 
+ *    name to the AIM conversation with that user
  */
 CALLER_OWN char *owl_function_smartfilter(int type, int invert_related)
@@ -2670 +2670 @@
 void owl_function_smartzpunt(int type)
 {
-  /* Starts a zpunt command based on the current class,instance pair. 
+  /* Starts a zpunt command based on the current class,instance pair.
    * If type=0, uses just class.  If type=1, uses instance as well. */
   const owl_view *v;
@@ -2676 +2676 @@
   const char *mclass, *minst;
   GString *buf;
-  
+
   v=owl_global_get_current_view(&g);
   m=owl_view_get_element(v, owl_global_get_curmsg(&g));
@@ -2759 +2759 @@
   }
   owl_filter_set_fgcolor(f, owl_util_string_to_color(fgcolor));
-  
+
   owl_mainwin_redisplay(owl_global_get_mainwin(&g));
   return(0);
@@ -2767 +2767 @@
 {
   owl_fmtext fm;
-  int i; 
-  
+  int i;
+
   owl_fmtext_init_null(&fm);
   owl_fmtext_append_normal(&fm,"default:  ");
@@ -2805 +2805 @@
      g_free(str2);
   }
-  
+
   owl_function_popless_fmtext(&fm);
   owl_fmtext_cleanup(&fm);
@@ -2923 +2923 @@
   }
   owl_fmtext_append_normal(&fm, "\n");
-  
+
   owl_function_popless_fmtext(&fm);
   owl_ptr_array_free(l, g_free);
@@ -2931 +2931 @@
 CALLER_OWN char *owl_function_keymap_summary(const char *name)
 {
-  const owl_keymap *km 
+  const owl_keymap *km
     = owl_keyhandler_get_keymap(owl_global_get_keyhandler(&g), name);
   if (km) return owl_keymap_summary(km);
@@ -2949 +2949 @@
   } else {
     owl_fmtext_append_normal(&fm, "No such keymap...\n");
-  }  
+  }
   owl_function_popless_fmtext(&fm);
   owl_fmtext_cleanup(&fm);
@@ -2960 +2960 @@
   owl_fmtext_init_null(&fm);
   owl_cmd_get_help(owl_global_get_cmddict(&g), cmdname, &fm);
-  owl_function_popless_fmtext(&fm);  
+  owl_function_popless_fmtext(&fm);
   owl_fmtext_cleanup(&fm);
 }
@@ -2993 +2993 @@
   viewsize=owl_view_get_size(v);
   curmsg=owl_global_get_curmsg(&g);
-  
+
   if (viewsize==0) {
     owl_function_makemsg("No messages present");
@@ -3041 +3041 @@
 }
 
-/* strips formatting from ztext and returns the unformatted text. 
+/* strips formatting from ztext and returns the unformatted text.
  * caller is responsible for freeing. */
 CALLER_OWN char *owl_function_ztext_stylestrip(const char *zt)
@@ -3167 +3167 @@
 
 /* Dump messages in the current view to the file 'filename'. */
-void owl_function_dump(const char *filename) 
+void owl_function_dump(const char *filename)
 {
   int i, j;
@@ -3221 +3221 @@
       }
     }
-    
+
     /* if it exited, spawn a new one */
     if (owl_global_get_newmsgproc_pid(&g)==0) {